Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-06 17:10:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Closes #359

Browse Source
This commit is contained in:
JustArchi
2016-11-13 15:35:34 +01:00
parent d924ad21f9
commit c3cc743b03
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ArchiSteamFarm/Logging.cs
View File

@@ -64,7 +64,7 @@ namespace ArchiSteamFarm {
config.AddTarget(eventLogTarget);
config.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, eventLogTarget));
} else if (Program.Mode != Program.EMode.Client) {
} else if (!Program.Mode.HasFlag(Program.EMode.Client) || Program.Mode.HasFlag(Program.EMode.Server)) {
FileTarget fileTarget = new FileTarget("File") {
DeleteOldFileOnStartup = true,
FileName = SharedInfo.LogFile,

21
ArchiSteamFarm/Program.cs
View File

@@ -25,6 +25,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using System.Reflection;
@@ -34,10 +35,12 @@ using System.Threading.Tasks;
namespace ArchiSteamFarm {
internal static class Program {
[Flags]
internal enum EMode : byte {
Normal, // Standard most common usage
Client, // WCF client only
Server // Normal + WCF server
[SuppressMessage("ReSharper", "UnusedMember.Global")]
Normal = 0, // Standard most common usage
Client = 1, // WCF client
Server = 2 // WCF server
}
private static readonly object ConsoleLock = new object();
@@ -196,10 +199,10 @@ namespace ArchiSteamFarm {
case "":
break;
case "--client":
Mode = EMode.Client;
Mode |= EMode.Client;
break;
case "--server":
Mode = EMode.Server;
Mode |= EMode.Server;
break;
default:
if (arg.StartsWith("--", StringComparison.Ordinal)) {
@@ -224,10 +227,10 @@ namespace ArchiSteamFarm {
case "":
break;
case "--client":
Mode = EMode.Client;
Mode |= EMode.Client;
break;
case "--server":
Mode = EMode.Server;
Mode |= EMode.Server;
WCF.StartServer();
break;
default:
@@ -239,7 +242,7 @@ namespace ArchiSteamFarm {
break;
}
if (Mode != EMode.Client) {
if (!Mode.HasFlag(EMode.Client)) {
ASF.ArchiLogger.LogGenericWarning("Ignoring command because --client wasn't specified: " + arg);
break;
}
@@ -329,7 +332,7 @@ namespace ArchiSteamFarm {
}
// If we ran ASF as a client, we're done by now
if (Mode == EMode.Client) {
if (Mode.HasFlag(EMode.Client) && !Mode.HasFlag(EMode.Server)) {
Exit();
}