From e48867000e28798cd231ef0e8f943bbd51631acf Mon Sep 17 00:00:00 2001 From: JustArchi Date: Fri, 18 Mar 2016 03:45:59 +0100 Subject: [PATCH] Add LogToFile, closes #168 --- ArchiSteamFarm/GlobalConfig.cs | 3 +++ ArchiSteamFarm/Logging.cs | 8 +++----- ArchiSteamFarm/Program.cs | 13 +++---------- ArchiSteamFarm/config/ASF.json | 1 + 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/ArchiSteamFarm/GlobalConfig.cs b/ArchiSteamFarm/GlobalConfig.cs index 55f324c32..e758e17bf 100644 --- a/ArchiSteamFarm/GlobalConfig.cs +++ b/ArchiSteamFarm/GlobalConfig.cs @@ -77,6 +77,9 @@ namespace ArchiSteamFarm { [JsonProperty(Required = Required.DisallowNull)] internal ushort WCFPort { get; private set; } = 1242; + [JsonProperty(Required = Required.DisallowNull)] + internal bool LogToFile { get; private set; } = true; + [JsonProperty(Required = Required.DisallowNull)] internal bool Statistics { get; private set; } = true; diff --git a/ArchiSteamFarm/Logging.cs b/ArchiSteamFarm/Logging.cs index 39ec2d06a..3e2412652 100644 --- a/ArchiSteamFarm/Logging.cs +++ b/ArchiSteamFarm/Logging.cs @@ -31,12 +31,10 @@ namespace ArchiSteamFarm { internal static class Logging { private static readonly object FileLock = new object(); - internal static bool? LogToFile { get; set; } = null; + private static bool LogToFile = false; internal static void Init() { - if (!LogToFile.HasValue) { - LogToFile = true; - } + LogToFile = Program.GlobalConfig.LogToFile; lock (FileLock) { try { @@ -123,7 +121,7 @@ namespace ArchiSteamFarm { } catch { } } - if (LogToFile.GetValueOrDefault()) { + if (LogToFile) { lock (FileLock) { try { File.AppendAllText(Program.LogFile, loggedMessage); diff --git a/ArchiSteamFarm/Program.cs b/ArchiSteamFarm/Program.cs index 1527345cf..eff12fa20 100644 --- a/ArchiSteamFarm/Program.cs +++ b/ArchiSteamFarm/Program.cs @@ -371,13 +371,6 @@ namespace ArchiSteamFarm { switch (arg) { case "--client": Mode = EMode.Client; - Logging.LogToFile = false; - break; - case "--log": - Logging.LogToFile = true; - break; - case "--no-log": - Logging.LogToFile = false; break; case "--server": Mode = EMode.Server; @@ -451,11 +444,11 @@ namespace ArchiSteamFarm { // If debugging is on, we prepare debug directory prior to running if (GlobalConfig.Debug) { - if (Directory.Exists(Program.DebugDirectory)) { - Directory.Delete(Program.DebugDirectory, true); + if (Directory.Exists(DebugDirectory)) { + Directory.Delete(DebugDirectory, true); Thread.Sleep(1000); // Dirty workaround giving Windows some time to sync } - Directory.CreateDirectory(Program.DebugDirectory); + Directory.CreateDirectory(DebugDirectory); SteamKit2.DebugLog.AddListener(new Debugging.DebugListener(Path.Combine(Program.DebugDirectory, "debug.txt"))); SteamKit2.DebugLog.Enabled = true; diff --git a/ArchiSteamFarm/config/ASF.json b/ArchiSteamFarm/config/ASF.json index 8580aeb4b..11a266db3 100644 --- a/ArchiSteamFarm/config/ASF.json +++ b/ArchiSteamFarm/config/ASF.json @@ -12,6 +12,7 @@ "HttpTimeout": 60, "WCFHostname": "localhost", "WCFPort": 1242, + "LogToFile": true, "Statistics": true, "HackIgnoreMachineID": false, "Blacklist": [