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

Strip down the original logger class

Browse Source
This commit is contained in:
Evil Factory
2026-02-13 18:58:35 -03:00
parent 36471f2239
commit a36bd70505
7 changed files with 24 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/GameMain.cs
-2
View File
@@ -985,8 +985,6 @@ namespace Barotrauma
Screen.Selected.AddToGUIUpdateList(); Screen.Selected.AddToGUIUpdateList();
LuaCsLogger.AddToGUIUpdateList();
Client?.AddToGUIUpdateList(); Client?.AddToGUIUpdateList();
SubmarinePreview.AddToGUIUpdateList(); SubmarinePreview.AddToGUIUpdateList();
Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsSetup.cs
-8
View File
@@ -13,14 +13,6 @@ namespace Barotrauma
{ {
partial class LuaCsSetup partial class LuaCsSetup
{ {
public void AddToGUIUpdateList()
{
if (!DisableErrorGUIOverlay)
{
LuaCsLogger.AddToGUIUpdateList();
}
}
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
Barotrauma/BarotraumaShared/SharedSource/LuaCs/ModUtils.cs
+6 -6
View File
@@ -74,27 +74,27 @@ namespace Barotrauma.LuaCs
public static void PrintMessage(string s) public static void PrintMessage(string s)
{ {
#if SERVER #if SERVER
LuaCsLogger.LogMessage($"[Server] {s}"); GameMain.LuaCs.Logger.LogMessage($"{s}");
#else #else
LuaCsLogger.LogMessage($"[Client] {s}"); GameMain.LuaCs.Logger.LogMessage($"{s}");
#endif #endif
} }
public static void PrintWarning(string s) public static void PrintWarning(string s)
{ {
#if SERVER #if SERVER
LuaCsLogger.Log($"[Server] {s}", Color.Yellow); GameMain.LuaCs.Logger.Log($"{s}", Color.Yellow);
#else #else
LuaCsLogger.Log($"[Client] {s}", Color.Yellow); GameMain.LuaCs.Logger.Log($"{s}", Color.Yellow);
#endif #endif
} }
public static void PrintError(string s) public static void PrintError(string s)
{ {
#if SERVER #if SERVER
LuaCsLogger.LogError($"[Server] {s}"); GameMain.LuaCs.Logger.LogError($"{s}");
#else #else
LuaCsLogger.LogError($"[Client] {s}"); GameMain.LuaCs.Logger.LogError($"{s}");
#endif #endif
} }
} }
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Plugins/ACsMod.cs
+1 -1
View File
@@ -48,7 +48,7 @@ namespace Barotrauma
} }
catch (Exception e) catch (Exception e)
{ {
LuaCsLogger.HandleException(e, LuaCsMessageOrigin.CSharpMod); GameMain.LuaCs.Logger.HandleException(e);
} }
IsDisposed = true; IsDisposed = true;
} }
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaScriptManagementService.cs
+2 -2
View File
@@ -191,7 +191,7 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
_script = new Script(CoreModules.Preset_SoftSandbox | CoreModules.Debug | CoreModules.IO | CoreModules.OS_System); _script = new Script(CoreModules.Preset_SoftSandbox | CoreModules.Debug | CoreModules.IO | CoreModules.OS_System);
_script.Options.DebugPrint = (string msg) => _script.Options.DebugPrint = (string msg) =>
{ {
_loggerService.Log(msg); _loggerService.LogMessage($"[Lua] {msg}");
}; };
_script.Options.ScriptLoader = _luaScriptLoader; _script.Options.ScriptLoader = _luaScriptLoader;
_script.Options.CheckThreadAccess = false; _script.Options.CheckThreadAccess = false;
@@ -221,7 +221,7 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
_script.Globals["loadfile"] = (Func<string, Table, string, DynValue>)LoadFile; _script.Globals["loadfile"] = (Func<string, Table, string, DynValue>)LoadFile;
_script.Globals["require"] = (Func<string, Table, DynValue>)luaRequire.Require; _script.Globals["require"] = (Func<string, Table, DynValue>)luaRequire.Require;
_script.Globals["printerror"] = (DynValue o) => { LuaCsLogger.LogError(o.ToString()); }; _script.Globals["printerror"] = (DynValue o) => { _loggerService.LogError($"[Lua] {o.ToString()}"); };
_script.Globals["dostring"] = (Func<string, Table, string, DynValue>)_script.DoString; _script.Globals["dostring"] = (Func<string, Table, string, DynValue>)_script.DoString;
_script.Globals["load"] = (Func<string, Table, string, DynValue>)_script.LoadString; _script.Globals["load"] = (Func<string, Table, string, DynValue>)_script.LoadString;
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Lua/LuaClasses/LuaCsLogger.cs
+11 -135
View File
@@ -15,167 +15,43 @@ namespace Barotrauma
partial class LuaCsLogger partial class LuaCsLogger
{ {
public static bool HideUserNames = true;
#if SERVER
private const string LogPrefix = "SV";
private const int NetMaxLength = 1024; // character limit of vanilla Barotrauma's chat system.
private const int NetMaxMessages = 60;
// This is used so its possible to call logging functions inside the serverLog
// hook without creating an infinite loop
private static bool lockLog = false;
#else
private const string LogPrefix = "CL";
#endif
public static LuaCsMessageLogger MessageLogger;
public static LuaCsExceptionHandler ExceptionHandler;
public static void HandleException(Exception ex, LuaCsMessageOrigin origin) public static void HandleException(Exception ex, LuaCsMessageOrigin origin)
{ {
string errorString = ""; GameMain.LuaCs.Logger.HandleException(ex);
switch (ex)
{
case NetRuntimeException netRuntimeException:
if (netRuntimeException.DecoratedMessage == null)
{
errorString = netRuntimeException.ToString();
}
else
{
// FIXME: netRuntimeException.ToString() doesn't print the InnerException's stack trace...
errorString = $"{netRuntimeException.DecoratedMessage}: {netRuntimeException}";
}
break;
case InterpreterException interpreterException:
if (interpreterException.DecoratedMessage == null)
{
errorString = interpreterException.ToString();
}
else
{
errorString = interpreterException.DecoratedMessage;
}
break;
default:
errorString = ex.StackTrace != null
? ex.ToString()
: $"{ex}\n{Environment.StackTrace}";
break;
}
LogError(Environment.UserName + " " + errorString, origin);
} }
public static void LogError(string message, LuaCsMessageOrigin origin) public static void LogError(string message, LuaCsMessageOrigin origin)
{ {
if (HideUserNames && !Environment.UserName.IsNullOrEmpty()) GameMain.LuaCs.Logger.LogError(message);
{
message = message.Replace(Environment.UserName, "USERNAME");
}
switch (origin)
{
case LuaCsMessageOrigin.LuaCs:
case LuaCsMessageOrigin.Unknown:
LogError($"[{LogPrefix} ERROR] {message}");
break;
case LuaCsMessageOrigin.LuaMod:
LogError($"[{LogPrefix} LUA ERROR] {message}");
break;
case LuaCsMessageOrigin.CSharpMod:
LogError($"[{LogPrefix} CS ERROR] {message}");
break;
}
} }
public static void LogError(string message) public static void LogError(string message)
{ {
Log($"{message}", Color.Red, ServerLog.MessageType.Error); GameMain.LuaCs.Logger.LogError(message);
} }
public static void LogMessage(string message, Color? serverColor = null, Color? clientColor = null) public static void LogMessage(string message, Color? serverColor = null, Color? clientColor = null)
{ {
if (serverColor == null) { serverColor = Color.MediumPurple; } GameMain.LuaCs.Logger.LogMessage(message, serverColor, clientColor);
if (clientColor == null) { clientColor = Color.Purple; }
#if SERVER
Log(message, serverColor);
#else
Log(message, clientColor);
#endif
} }
public static void Log(string message, Color? color = null, ServerLog.MessageType messageType = ServerLog.MessageType.ServerMessage) public static void Log(string message, Color? color = null, ServerLog.MessageType messageType = ServerLog.MessageType.ServerMessage)
{ {
MessageLogger?.Invoke(message); GameMain.LuaCs.Logger.Log(message, color, messageType);
DebugConsole.NewMessage(message, color);
#if SERVER
void broadcastMessage(string m)
{
foreach (var client in GameMain.Server.ConnectedClients)
{
//if (client.ChatMsgQueue.Count > NetMaxMessages)
//{
// If there's an error or message happening many times per second (inside Update loop for example)
// we will need to discart some messages so the client doesn't get overloaded by all
// those net messages.
// continue;
//}
ChatMessage consoleMessage = ChatMessage.Create("", m, ChatMessageType.Console, null, textColor: color);
GameMain.Server.SendDirectChatMessage(consoleMessage, client);
if (!GameMain.Server.ServerSettings.SaveServerLogs || !client.HasPermission(ClientPermissions.ServerLog))
{
continue;
}
ChatMessage logMessage = ChatMessage.Create(messageType.ToString(), "[LuaCs] " + m, ChatMessageType.ServerLog, null);
GameMain.Server.SendDirectChatMessage(logMessage, client);
}
}
if (GameMain.Server != null)
{
if (GameMain.Server.ServerSettings.SaveServerLogs)
{
string logMessage = "[LuaCs] " + message;
GameMain.Server.ServerSettings.ServerLog.WriteLine(logMessage, messageType, false);
if (!lockLog)
{
lockLog = true;
GameMain.LuaCs?.Hook?.Call("serverLog", logMessage, messageType);
lockLog = false;
}
}
for (int i = 0; i < message.Length; i += NetMaxLength)
{
string subStr = message.Substring(i, Math.Min(1024, message.Length - i));
broadcastMessage(subStr);
}
}
#endif
} }
} }
partial class LuaCsSetup partial class LuaCsSetup
{ {
// Compatibility with cs mods that use this method. // Compatibility with cs mods that use this method.
public static void PrintLuaError(object message) => LuaCsLogger.LogError($"{message}", LuaCsMessageOrigin.LuaMod); public static void PrintLuaError(object message) => GameMain.LuaCs.Logger.LogError($"{message}");
public static void PrintCsError(object message) => LuaCsLogger.LogError($"{message}", LuaCsMessageOrigin.CSharpMod); public static void PrintCsError(object message) => GameMain.LuaCs.Logger.LogError($"{message}");
public static void PrintGenericError(object message) => LuaCsLogger.LogError($"{message}", LuaCsMessageOrigin.LuaCs); public static void PrintGenericError(object message) => GameMain.LuaCs.Logger.LogError($"{message}");
internal void PrintMessage(object message) => LuaCsLogger.LogMessage($"{message}"); internal void PrintMessage(object message) => GameMain.LuaCs.Logger.LogMessage($"{message}");
public static void PrintCsMessage(object message) => LuaCsLogger.LogMessage($"{message}"); public static void PrintCsMessage(object message) => GameMain.LuaCs.Logger.LogMessage($"{message}");
internal void HandleException(Exception ex, LuaCsMessageOrigin origin) => LuaCsLogger.HandleException(ex, origin); internal void HandleException(Exception ex, LuaCsMessageOrigin origin) => GameMain.LuaCs.Logger.HandleException(ex);
} }
} }
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Lua/LuaClasses/LuaCsTimer.cs
+4 -2
View File
@@ -57,10 +57,12 @@ namespace Barotrauma
private List<TimedAction> timedActions = new List<TimedAction>(); private List<TimedAction> timedActions = new List<TimedAction>();
private readonly IEventService _eventService; private readonly IEventService _eventService;
private readonly ILoggerService _loggerService;
public LuaCsTimer(IEventService eventService) public LuaCsTimer(IEventService eventService, ILoggerService loggerService)
{ {
_eventService = eventService; _eventService = eventService;
_loggerService = loggerService;
SubscribeToEvents(); SubscribeToEvents();
} }
@@ -117,7 +119,7 @@ namespace Barotrauma
} }
catch (Exception e) catch (Exception e)
{ {
LuaCsLogger.HandleException(e, LuaCsMessageOrigin.CSharpMod); _loggerService.HandleException(e);
} }
timedActions.Remove(timedAction); timedActions.Remove(timedAction);