Better logging

This commit is contained in:
Evil Factory
2026-03-01 13:09:05 -03:00
parent 22a74bf1fd
commit 9ee4728e2a
3 changed files with 21 additions and 6 deletions
@@ -325,6 +325,8 @@ namespace Barotrauma
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
void RunStateUnloaded_OnEnter(State<RunState> currentState) void RunStateUnloaded_OnEnter(State<RunState> currentState)
{ {
Logger.LogMessage("LuaCs unloaded state entered");
if (PackageManagementService.IsAnyPackageRunning()) if (PackageManagementService.IsAnyPackageRunning())
{ {
Logger.LogResults(PackageManagementService.StopRunningPackages()); Logger.LogResults(PackageManagementService.StopRunningPackages());
@@ -342,6 +344,8 @@ namespace Barotrauma
PackageManagementService.Reset(); PackageManagementService.Reset();
NetworkingService.Reset(); NetworkingService.Reset();
Logger.LogMessage("Services have been reset");
SubscribeToLuaCsEvents(); SubscribeToLuaCsEvents();
CurrentRunState = RunState.Unloaded; CurrentRunState = RunState.Unloaded;
@@ -349,6 +353,8 @@ namespace Barotrauma
void RunStateLoadedNoExec_OnEnter(State<RunState> currentState) void RunStateLoadedNoExec_OnEnter(State<RunState> currentState)
{ {
Logger.LogMessage("LuaCs no execution state entered");
if (PackageManagementService.IsAnyPackageRunning()) if (PackageManagementService.IsAnyPackageRunning())
{ {
Logger.LogResults(PackageManagementService.StopRunningPackages()); Logger.LogResults(PackageManagementService.StopRunningPackages());
@@ -371,6 +377,9 @@ namespace Barotrauma
void RunStateRunning_OnEnter(State<RunState> currentState) void RunStateRunning_OnEnter(State<RunState> currentState)
{ {
string csEnabled = IsCsEnabled ? "enabled" : "disabled";
Logger.LogMessage($"LuaCs running state entered. Running under commit {AssemblyInfo.GitRevision}, CSharp is {csEnabled}");
if (!PackageManagementService.IsAnyPackageLoaded()) if (!PackageManagementService.IsAnyPackageLoaded())
{ {
foreach (var registrationProvider in _servicesProvider.GetAllServices<ISettingsRegistrationProvider>()) foreach (var registrationProvider in _servicesProvider.GetAllServices<ISettingsRegistrationProvider>())
@@ -396,10 +405,15 @@ namespace Barotrauma
#endif #endif
CurrentRunState = RunState.Running; CurrentRunState = RunState.Running;
} }
void RunStateRunning_OnExit(State<RunState> currentState) void RunStateRunning_OnExit(State<RunState> currentState)
{ {
EventService.Call("stop");
Logger.LogResults(PackageManagementService.StopRunningPackages()); Logger.LogResults(PackageManagementService.StopRunningPackages());
Logger.LogMessage("LuaCs running state exited");
} }
// ReSharper restore InconsistentNaming // ReSharper restore InconsistentNaming
} }
@@ -348,7 +348,7 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
return FluentResults.Result.Fail("Tried to execute Lua scripts without unloading first."); return FluentResults.Result.Fail("Tried to execute Lua scripts without unloading first.");
} }
_loggerService.LogMessage("Executing Lua scripts"); _loggerService.LogMessage("[Lua] Executing scripts");
SetupEnvironment(enableSandbox); SetupEnvironment(enableSandbox);
@@ -373,7 +373,7 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
{ {
try try
{ {
_loggerService.LogMessage($"Run {filePath.Value}"); _loggerService.LogMessage($"[Lua] - Run {filePath.Value}");
_script.Call(_script.LoadFile(filePath.FullPath), resource.OwnerPackage.Dir); _script.Call(_script.LoadFile(filePath.FullPath), resource.OwnerPackage.Dir);
} }
catch(Exception e) catch(Exception e)
@@ -356,6 +356,8 @@ public class PluginManagementService : IAssemblyManagementService
{ {
return FluentResults.Result.Ok(); return FluentResults.Result.Ok();
} }
_logger.LogMessage($"Activating {nameof(IAssemblyPlugin)} instances");
var loadedPackagePlugins = var loadedPackagePlugins =
ImmutableArray.CreateBuilder<(ContentPackage Package, ImmutableArray<IAssemblyPlugin> Plugins)>(); ImmutableArray.CreateBuilder<(ContentPackage Package, ImmutableArray<IAssemblyPlugin> Plugins)>();
@@ -368,6 +370,7 @@ public class PluginManagementService : IAssemblyManagementService
{ {
try try
{ {
_logger.LogMessage($"- Instantiating {pluginType.Name}");
var plugin = (IAssemblyPlugin)Activator.CreateInstance(pluginType); var plugin = (IAssemblyPlugin)Activator.CreateInstance(pluginType);
_pluginInjectorContainer.InjectProperties(plugin); _pluginInjectorContainer.InjectProperties(plugin);
_pluginInjectorContainer.Register(pluginType, fac => plugin); _pluginInjectorContainer.Register(pluginType, fac => plugin);
@@ -579,9 +582,7 @@ public class PluginManagementService : IAssemblyManagementService
continue; continue;
} }
#if DEBUG _logger.LogMessage($"Compiling assembly for {scripts.Key}, in ContentPackage {contentPackRes.Key.Name}");
_logger.Log($"[DEBUG] Compiling assembly for {scripts.Key}, in ContentPackage {contentPackRes.Key.Name}");
#endif
result.WithReasons(assemblyLoader.CompileScriptAssembly( result.WithReasons(assemblyLoader.CompileScriptAssembly(
assemblyName: scripts.Key, assemblyName: scripts.Key,