PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

fixed game analytics logger crash

Browse Source
This commit is contained in:
z__
2022-02-04 13:44:04 +07:00
parent 3696f18714
commit cf75210304
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Torch.Server/Program.cs
View File

@@ -63,7 +63,8 @@ namespace Torch.Server
File.Move(oldTorchCfg, torchCfg, true); File.Move(oldTorchCfg, torchCfg, true);
Target.Register<LogViewerTarget>(nameof(LogViewerTarget)); Target.Register<LogViewerTarget>(nameof(LogViewerTarget));
LogManager.Configuration = new XmlLoggingConfiguration(newNlog); TorchLogManager.Configuration = new XmlLoggingConfiguration(newNlog);
LogManager.Configuration = TorchLogManager.Configuration;
LogManager.ReconfigExistingLoggers(); LogManager.ReconfigExistingLoggers();
var config = Persistent<TorchConfig>.Load(torchCfg); var config = Persistent<TorchConfig>.Load(torchCfg);

9
Torch/Patches/GameAnalyticsPatch.cs
View File

@@ -5,6 +5,7 @@ using System.Runtime.CompilerServices;
using NLog; using NLog;
using NLog.Config; using NLog.Config;
using Torch.Managers.PatchManager; using Torch.Managers.PatchManager;
using Torch.Utils;
namespace Torch.Patches namespace Torch.Patches
{ {
@@ -36,16 +37,14 @@ namespace Torch.Patches
_log.Warn("GALogger constructor is unknown. Logging may not function."); _log.Warn("GALogger constructor is unknown. Logging may not function.");
return; return;
} }
ctx.GetPattern(ctor).Prefixes.Add(typeof(GameAnalyticsPatch).GetMethod(nameof(PatchLogger), ctx.GetPattern(ctor).AddPrefix(nameof(PatchLogger));
BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public));
} }
private static void FixLogging() private static void FixLogging()
{ {
_setLogger(null, LogManager.GetLogger("GameAnalytics")); _setLogger(null, LogManager.GetLogger("GameAnalytics"));
if (!(LogManager.Configuration is XmlLoggingConfiguration)) if (LogManager.Configuration is not XmlLoggingConfiguration)
LogManager.Configuration = new XmlLoggingConfiguration(Path.Combine( LogManager.Configuration = TorchLogManager.Configuration;
Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) ?? Environment.CurrentDirectory, "NLog.config"));
} }
private static bool PatchLogger() private static bool PatchLogger()

8
Torch/Utils/TorchLogManager.cs Normal file
View File

@@ -0,0 +1,8 @@
using NLog.Config;
namespace Torch.Utils;
public static class TorchLogManager
{
public static LoggingConfiguration Configuration { get; set; }
}