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

Update NLog, change init order, fix block delete in UI, change config to JSON

Browse Source
This commit is contained in:
John Gross
2017-07-18 17:31:08 -07:00
parent 17ee96038c
commit 96d1faddbe
13 changed files with 70 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Torch.Server/Program.cs
View File

@@ -23,6 +23,7 @@ using Torch.Server.Views;
using VRage.Game.ModAPI;
using System.IO.Compression;
using System.Net;
using System.Security.Policy;
using Torch.Server.Managers;
using VRage.FileSystem;
using VRageRender;
@@ -61,37 +62,22 @@ namespace Torch.Server
return;
}
var configName = "TorchConfig.xml";
var configPath = Path.Combine(Directory.GetCurrentDirectory(), configName);
if (File.Exists(configName))
//CommandLine reflection triggers assembly loading, so DS update must be completely separated.
if (!args.Contains("-noupdate"))
{
_log.Info($"Loading config {configPath}");
_config = TorchConfig.LoadFrom(configPath);
}
else
{
_log.Info($"Generating default config at {configPath}");
_config = new TorchConfig {InstancePath = Path.GetFullPath("Instance")};
_log.Warn("Would you like to enable automatic updates? (Y/n):");
var input = Console.ReadLine() ?? "";
var autoUpdate = string.IsNullOrEmpty(input) || input.Equals("y", StringComparison.InvariantCultureIgnoreCase);
_config.GetTorchUpdates = _config.GetPluginUpdates = autoUpdate;
if (autoUpdate)
if (!Directory.Exists("DedicatedServer64"))
{
_log.Info("Automatic updates enabled.");
RunSteamCmd();
_log.Error("Game libraries not found. Press the Enter key to install the dedicated server.");
Console.ReadLine();
}
_config.Save(configPath);
RunSteamCmd();
}
InitConfig();
if (!_config.Parse(args))
return;
_log.Debug(_config.ToString());
if (!string.IsNullOrEmpty(_config.WaitForPID))
{
try
@@ -110,14 +96,26 @@ namespace Torch.Server
}
_restartOnCrash = _config.RestartOnCrash;
if (_config.GetTorchUpdates || _config.Update)
{
RunSteamCmd();
}
RunServer(_config);
}
public static void InitConfig()
{
var configName = "Torch.cfg";
var configPath = Path.Combine(Directory.GetCurrentDirectory(), configName);
if (File.Exists(configName))
{
_log.Info($"Loading config {configPath}");
_config = TorchConfig.LoadFrom(configPath);
}
else
{
_log.Info($"Generating default config at {configPath}");
_config = new TorchConfig { InstancePath = Path.GetFullPath("Instance") };
_config.Save(configPath);
}
}
private const string STEAMCMD_DIR = "steamcmd";
private const string STEAMCMD_ZIP = "temp.zip";
private static readonly string STEAMCMD_PATH = $"{STEAMCMD_DIR}\\steamcmd.exe";