Skip to content

Commit 4c0baee

Browse files
committed
Remove crash handler for now.
1 parent 50bfaa8 commit 4c0baee

File tree

3 files changed

+0
-31
lines changed

3 files changed

+0
-31
lines changed

NWN.Anvil/src/main/AnvilCore.FunctionHandlers.cs

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -131,32 +131,5 @@ private static void OnAssertFail(IntPtr messagePtr, IntPtr nativeStackTracePtr)
131131
$"{message}{nativeStackTrace}\n" +
132132
$"{stackTrace}");
133133
}
134-
135-
[UnmanagedCallersOnly]
136-
private static void OnServerCrash(int signal, IntPtr nativeStackTracePtr)
137-
{
138-
string stackTrace = nativeStackTracePtr.ReadNullTerminatedString();
139-
string managedTrace = new StackTrace(true).ToString();
140-
141-
string error = signal switch
142-
{
143-
4 => "Illegal instruction",
144-
6 => "Program aborted",
145-
8 => "Floating point exception",
146-
11 => "Segmentation fault",
147-
_ => "Unknown error",
148-
};
149-
150-
string message = "\n==============================================================\n" +
151-
" Please file a bug at https://github.com/nwn-dotnet/Anvil/issues\n" +
152-
$" {runtimeInfo.AssemblyName} {runtimeInfo.AssemblyVersion} has crashed. Fatal error: {error} ({signal})\n" +
153-
$" Using: NWN {runtimeInfo.ServerVersion}, NWN.Core {runtimeInfo.CoreVersion}, NWN.Native {runtimeInfo.NativeVersion}\n" +
154-
"==============================================================\n" +
155-
" Managed Backtrace:\n" +
156-
$"{managedTrace}" +
157-
$"{stackTrace}";
158-
159-
Console.WriteLine(message);
160-
}
161134
}
162135
}

NWN.Anvil/src/main/AnvilCore.RuntimeInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ private struct RuntimeInfo
88
{
99
public string? AssemblyName;
1010
public string? AssemblyVersion;
11-
public string? ServerVersion;
1211
public string? CoreVersion;
1312
public string? NativeVersion;
1413
}

NWN.Anvil/src/main/AnvilCore.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public static unsafe int Init(IntPtr arg, int argLength, IServiceManager? servic
6161
Closure = &OnClosure,
6262
MainLoop = &OnLoop,
6363
AssertFail = &OnAssertFail,
64-
CrashHandler = &OnServerCrash,
6564
};
6665

6766
return NWNCore.Init(arg, argLength, instance, eventHandles);
@@ -122,8 +121,6 @@ private void Init()
122121
throw;
123122
}
124123

125-
runtimeInfo.ServerVersion = NwServer.Instance.ServerVersion.ToString();
126-
127124
Log.Info($"Loading {runtimeInfo.AssemblyName} {runtimeInfo.AssemblyVersion} (NWN.Core: {runtimeInfo.CoreVersion}, NWN.Native: {runtimeInfo.NativeVersion})");
128125
CheckServerVersion();
129126
}

0 commit comments

Comments
 (0)