space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix GameController exception logging memory leak in tests.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2022-12-10 12:27:23 +01:00
parent 509aca8c03
commit 55fd79eb36
2 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Robust.Client/GameController/GameController.cs
View File

@@ -277,12 +277,15 @@ namespace Robust.Client
return new ResourceManifestData(modules, assemblyPrefix, defaultWindowTitle, windowIconSet, splashLogo, autoConnect);
}
internal bool StartupSystemSplash(GameControllerOptions options, Func<ILogHandler>? logHandlerFactory)
internal bool StartupSystemSplash(
GameControllerOptions options,
Func<ILogHandler>? logHandlerFactory,
bool globalExceptionLog = false)
{
Options = options;
ReadInitialLaunchState();
SetupLogging(_logManager, logHandlerFactory ?? (() => new ConsoleLogHandler()));
SetupLogging(_logManager, logHandlerFactory ?? (() => new ConsoleLogHandler()), globalExceptionLog);
if (_commandLineArgs != null)
{
@@ -599,7 +602,10 @@ namespace Robust.Client
}
}
internal static void SetupLogging(ILogManager logManager, Func<ILogHandler> logHandlerFactory)
internal static void SetupLogging(
ILogManager logManager,
Func<ILogHandler> logHandlerFactory,
bool globalExceptionLog)
{
logManager.RootSawmill.AddHandler(logHandlerFactory());
@@ -616,34 +622,37 @@ namespace Robust.Client
logManager.GetSawmill("szr").Level = LogLevel.Info;
logManager.GetSawmill("loc").Level = LogLevel.Warning;
if (globalExceptionLog)
{
#if DEBUG_ONLY_FCE_INFO
#if DEBUG_ONLY_FCE_LOG
var fce = logManager.GetSawmill("fce");
var fce = logManager.GetSawmill("fce");
#endif
AppDomain.CurrentDomain.FirstChanceException += (sender, args) =>
{
// TODO: record FCE stats
AppDomain.CurrentDomain.FirstChanceException += (sender, args) =>
{
// TODO: record FCE stats
#if DEBUG_ONLY_FCE_LOG
fce.Fatal(message);
fce.Fatal(message);
#endif
}
}
#endif
var uh = logManager.GetSawmill("unhandled");
AppDomain.CurrentDomain.UnhandledException += (sender, args) =>
{
var message = ((Exception)args.ExceptionObject).ToString();
uh.Log(args.IsTerminating ? LogLevel.Fatal : LogLevel.Error, message);
};
var uh = logManager.GetSawmill("unhandled");
AppDomain.CurrentDomain.UnhandledException += (sender, args) =>
{
var message = ((Exception)args.ExceptionObject).ToString();
uh.Log(args.IsTerminating ? LogLevel.Fatal : LogLevel.Error, message);
};
var uo = logManager.GetSawmill("unobserved");
TaskScheduler.UnobservedTaskException += (sender, args) =>
{
uo.Error(args.Exception!.ToString());
var uo = logManager.GetSawmill("unobserved");
TaskScheduler.UnobservedTaskException += (sender, args) =>
{
uo.Error(args.Exception!.ToString());
#if EXCEPTION_TOLERANCE
args.SetObserved(); // don't crash
args.SetObserved(); // don't crash
#endif
};
};
}
}
private string GetUserDataDir()