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

Fix services?

Browse Source
This commit is contained in:
John Gross
2019-08-31 23:25:05 -07:00
parent 997a3ca31c
commit 6680b0adb2
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Torch.Server/Program.cs
View File

@@ -63,7 +63,7 @@ namespace Torch.Server
// Breaks on Windows Server 2019 // Breaks on Windows Server 2019
if (!new ComputerInfo().OSFullName.Contains("Server 2019") && !Environment.UserInteractive) if (!new ComputerInfo().OSFullName.Contains("Server 2019") && !Environment.UserInteractive)
{ {
using (var service = new TorchService()) using (var service = new TorchService(args))
ServiceBase.Run(service); ServiceBase.Run(service);
return; return;
} }

10
Torch.Server/TorchService.cs
View File

@@ -15,9 +15,11 @@ namespace Torch.Server
public const string Name = "Torch (SEDS)"; public const string Name = "Torch (SEDS)";
private TorchServer _server; private TorchServer _server;
private Initializer _initializer; private Initializer _initializer;
private string[] _args;
public TorchService() public TorchService(string[] args)
{ {
_args = args;
var workingDir = new FileInfo(typeof(TorchService).Assembly.Location).Directory.ToString(); var workingDir = new FileInfo(typeof(TorchService).Assembly.Location).Directory.ToString();
Directory.SetCurrentDirectory(workingDir); Directory.SetCurrentDirectory(workingDir);
_initializer = new Initializer(workingDir); _initializer = new Initializer(workingDir);
@@ -29,11 +31,11 @@ namespace Torch.Server
} }
/// <inheritdoc /> /// <inheritdoc />
protected override void OnStart(string[] args) protected override void OnStart(string[] _)
{ {
base.OnStart(args); base.OnStart(_args);
_initializer.Initialize(args); _initializer.Initialize(_args);
_initializer.Run(); _initializer.Run();
} }

3
Torch/VRageGame.cs
View File

@@ -199,7 +199,8 @@ namespace Torch
} }
MyRenderProxy.Initialize(renderer); MyRenderProxy.Initialize(renderer);
MyRenderProfiler.SetAutocommit(false); MyRenderProfiler.SetAutocommit(false);
MyRenderProfiler.InitMemoryHack("MainEntryPoint"); //This broke services?
//MyRenderProfiler.InitMemoryHack("MainEntryPoint");
} }
// Loads object builder serializers. Intuitive, right? // Loads object builder serializers. Intuitive, right?