Compare commits
2 Commits
v1.0.29-ma
...
v1.0.31-ma
Author | SHA1 | Date | |
---|---|---|---|
![]() |
cf75210304 | ||
![]() |
3696f18714 |
@@ -1,5 +1,7 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using NLog;
|
||||
using NLog.Config;
|
||||
using NLog.Targets;
|
||||
using Torch.Utils;
|
||||
|
||||
@@ -12,7 +14,6 @@ namespace Torch.Server
|
||||
{
|
||||
var isService = Environment.GetEnvironmentVariable("TORCH_SERVICE")
|
||||
?.Equals(bool.TrueString, StringComparison.OrdinalIgnoreCase) ?? false;
|
||||
Target.Register<LogViewerTarget>(nameof(LogViewerTarget));
|
||||
//Ensures that all the files are downloaded in the Torch directory.
|
||||
var workingDir = AppContext.BaseDirectory;
|
||||
var binDir = Path.Combine(Environment.GetEnvironmentVariable("TORCH_GAME_PATH") ?? workingDir, "DedicatedServer64");
|
||||
@@ -46,12 +47,25 @@ namespace Torch.Server
|
||||
{
|
||||
instancePath = Directory.CreateDirectory(instanceName).FullName;
|
||||
}
|
||||
|
||||
var oldNlog = Path.Combine(workingDir, "NLog.config");
|
||||
var newNlog = Path.Combine(instancePath, "NLog.config");
|
||||
if (File.Exists(oldNlog))
|
||||
File.Move(oldNlog, newNlog, true);
|
||||
else if (!File.Exists(newNlog))
|
||||
using (var f = File.Create(newNlog))
|
||||
typeof(Program).Assembly.GetManifestResourceStream("Torch.Server.NLog.config")!.CopyTo(f);
|
||||
|
||||
var oldTorchCfg = Path.Combine(workingDir, "Torch.cfg");
|
||||
var torchCfg = Path.Combine(instancePath, "Torch.cfg");
|
||||
|
||||
if (File.Exists(oldTorchCfg))
|
||||
File.Move(oldTorchCfg, torchCfg, true);
|
||||
|
||||
Target.Register<LogViewerTarget>(nameof(LogViewerTarget));
|
||||
TorchLogManager.Configuration = new XmlLoggingConfiguration(newNlog);
|
||||
LogManager.Configuration = TorchLogManager.Configuration;
|
||||
LogManager.ReconfigExistingLoggers();
|
||||
|
||||
var config = Persistent<TorchConfig>.Load(torchCfg);
|
||||
config.Data.InstanceName = instanceName;
|
||||
|
@@ -160,6 +160,6 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Page Remove="Views\WorldSelectControl.xaml" />
|
||||
<None Include="..\NLog.config" Visible="false" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="Always" />
|
||||
<EmbeddedResource Include="..\NLog.config" Visible="false" />
|
||||
</ItemGroup>
|
||||
</Project>
|
@@ -5,6 +5,7 @@ using System.Runtime.CompilerServices;
|
||||
using NLog;
|
||||
using NLog.Config;
|
||||
using Torch.Managers.PatchManager;
|
||||
using Torch.Utils;
|
||||
|
||||
namespace Torch.Patches
|
||||
{
|
||||
@@ -36,16 +37,14 @@ namespace Torch.Patches
|
||||
_log.Warn("GALogger constructor is unknown. Logging may not function.");
|
||||
return;
|
||||
}
|
||||
ctx.GetPattern(ctor).Prefixes.Add(typeof(GameAnalyticsPatch).GetMethod(nameof(PatchLogger),
|
||||
BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public));
|
||||
ctx.GetPattern(ctor).AddPrefix(nameof(PatchLogger));
|
||||
}
|
||||
|
||||
private static void FixLogging()
|
||||
{
|
||||
_setLogger(null, LogManager.GetLogger("GameAnalytics"));
|
||||
if (!(LogManager.Configuration is XmlLoggingConfiguration))
|
||||
LogManager.Configuration = new XmlLoggingConfiguration(Path.Combine(
|
||||
Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) ?? Environment.CurrentDirectory, "NLog.config"));
|
||||
if (LogManager.Configuration is not XmlLoggingConfiguration)
|
||||
LogManager.Configuration = TorchLogManager.Configuration;
|
||||
}
|
||||
|
||||
private static bool PatchLogger()
|
||||
|
8
Torch/Utils/TorchLogManager.cs
Normal file
8
Torch/Utils/TorchLogManager.cs
Normal file
@@ -0,0 +1,8 @@
|
||||
using NLog.Config;
|
||||
|
||||
namespace Torch.Utils;
|
||||
|
||||
public static class TorchLogManager
|
||||
{
|
||||
public static LoggingConfiguration Configuration { get; set; }
|
||||
}
|
Reference in New Issue
Block a user