vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better logging

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
View File

@@ -325,6 +325,8 @@ namespace Barotrauma
// ReSharper disable InconsistentNaming
void RunStateUnloaded_OnEnter(State<RunState> currentState)
{
Logger.LogMessage("LuaCs unloaded state entered");
if (PackageManagementService.IsAnyPackageRunning())
{
Logger.LogResults(PackageManagementService.StopRunningPackages());
@@ -342,6 +344,8 @@ namespace Barotrauma
PackageManagementService.Reset();
NetworkingService.Reset();
Logger.LogMessage("Services have been reset");
SubscribeToLuaCsEvents();
CurrentRunState = RunState.Unloaded;
@@ -349,6 +353,8 @@ namespace Barotrauma
void RunStateLoadedNoExec_OnEnter(State<RunState> currentState)
{
Logger.LogMessage("LuaCs no execution state entered");
if (PackageManagementService.IsAnyPackageRunning())
{
Logger.LogResults(PackageManagementService.StopRunningPackages());
@@ -371,6 +377,9 @@ namespace Barotrauma
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())
{
foreach (var registrationProvider in _servicesProvider.GetAllServices<ISettingsRegistrationProvider>())
@@ -396,10 +405,15 @@ namespace Barotrauma
#endif
CurrentRunState = RunState.Running;
}
void RunStateRunning_OnExit(State<RunState> currentState)
{
EventService.Call("stop");
Logger.LogResults(PackageManagementService.StopRunningPackages());
Logger.LogMessage("LuaCs running state exited");
}
// ReSharper restore InconsistentNaming
}

4
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaScriptManagementService.cs
View File

@@ -348,7 +348,7 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
return FluentResults.Result.Fail("Tried to execute Lua scripts without unloading first.");
}
_loggerService.LogMessage("Executing Lua scripts");
_loggerService.LogMessage("[Lua] Executing scripts");
SetupEnvironment(enableSandbox);
@@ -373,7 +373,7 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
{
try
{
_loggerService.LogMessage($"Run {filePath.Value}");
_loggerService.LogMessage($"[Lua] - Run {filePath.Value}");
_script.Call(_script.LoadFile(filePath.FullPath), resource.OwnerPackage.Dir);
}
catch(Exception e)

7
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/PluginManagementService.cs
View File

@@ -356,6 +356,8 @@ public class PluginManagementService : IAssemblyManagementService
{
return FluentResults.Result.Ok();
}
_logger.LogMessage($"Activating {nameof(IAssemblyPlugin)} instances");
var loadedPackagePlugins =
ImmutableArray.CreateBuilder<(ContentPackage Package, ImmutableArray<IAssemblyPlugin> Plugins)>();
@@ -368,6 +370,7 @@ public class PluginManagementService : IAssemblyManagementService
{
try
{
_logger.LogMessage($"- Instantiating {pluginType.Name}");
var plugin = (IAssemblyPlugin)Activator.CreateInstance(pluginType);
_pluginInjectorContainer.InjectProperties(plugin);
_pluginInjectorContainer.Register(pluginType, fac => plugin);
@@ -579,9 +582,7 @@ public class PluginManagementService : IAssemblyManagementService
continue;
}
#if DEBUG
_logger.Log($"[DEBUG] Compiling assembly for {scripts.Key}, in ContentPackage {contentPackRes.Key.Name}");
#endif
_logger.LogMessage($"Compiling assembly for {scripts.Key}, in ContentPackage {contentPackRes.Key.Name}");
result.WithReasons(assemblyLoader.CompileScriptAssembly(
assemblyName: scripts.Key,