Skip to content

Commit 69d6d6e

Browse files
committed
Use ASF instead of Main for global logging routines, closes #280
1 parent 38eb130 commit 69d6d6e

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

ArchiSteamFarm/Logging.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ internal static void OnUserInputEnd() {
114114
LogManager.ReconfigExistingLoggers();
115115
}
116116

117-
internal static void LogGenericError(string message, string botName = "Main", [CallerMemberName] string previousMethodName = null) {
117+
internal static void LogGenericError(string message, string botName = Program.ASF, [CallerMemberName] string previousMethodName = null) {
118118
if (string.IsNullOrEmpty(message)) {
119119
LogNullError(nameof(message), botName);
120120
return;
@@ -123,7 +123,7 @@ internal static void LogGenericError(string message, string botName = "Main", [C
123123
Logger.Error($"{botName}|{previousMethodName}() {message}");
124124
}
125125

126-
internal static void LogGenericException(Exception exception, string botName = "Main", [CallerMemberName] string previousMethodName = null) {
126+
internal static void LogGenericException(Exception exception, string botName = Program.ASF, [CallerMemberName] string previousMethodName = null) {
127127
if (exception == null) {
128128
LogNullError(nameof(exception), botName);
129129
return;
@@ -132,7 +132,7 @@ internal static void LogGenericException(Exception exception, string botName = "
132132
Logger.Error(exception, $"{botName}|{previousMethodName}()");
133133
}
134134

135-
internal static void LogFatalException(Exception exception, string botName = "Main", [CallerMemberName] string previousMethodName = null) {
135+
internal static void LogFatalException(Exception exception, string botName = Program.ASF, [CallerMemberName] string previousMethodName = null) {
136136
if (exception == null) {
137137
LogNullError(nameof(exception), botName);
138138
return;
@@ -141,7 +141,7 @@ internal static void LogFatalException(Exception exception, string botName = "Ma
141141
Logger.Fatal(exception, $"{botName}|{previousMethodName}()");
142142
}
143143

144-
internal static void LogGenericWarning(string message, string botName = "Main", [CallerMemberName] string previousMethodName = null) {
144+
internal static void LogGenericWarning(string message, string botName = Program.ASF, [CallerMemberName] string previousMethodName = null) {
145145
if (string.IsNullOrEmpty(message)) {
146146
LogNullError(nameof(message), botName);
147147
return;
@@ -150,7 +150,7 @@ internal static void LogGenericWarning(string message, string botName = "Main",
150150
Logger.Warn($"{botName}|{previousMethodName}() {message}");
151151
}
152152

153-
internal static void LogGenericInfo(string message, string botName = "Main", [CallerMemberName] string previousMethodName = null) {
153+
internal static void LogGenericInfo(string message, string botName = Program.ASF, [CallerMemberName] string previousMethodName = null) {
154154
if (string.IsNullOrEmpty(message)) {
155155
LogNullError(nameof(message), botName);
156156
return;
@@ -160,7 +160,7 @@ internal static void LogGenericInfo(string message, string botName = "Main", [Ca
160160
}
161161

162162
[SuppressMessage("ReSharper", "ExplicitCallerInfoArgument")]
163-
internal static void LogNullError(string nullObjectName, string botName = "Main", [CallerMemberName] string previousMethodName = null) {
163+
internal static void LogNullError(string nullObjectName, string botName = Program.ASF, [CallerMemberName] string previousMethodName = null) {
164164
if (string.IsNullOrEmpty(nullObjectName)) {
165165
return;
166166
}
@@ -170,7 +170,7 @@ internal static void LogNullError(string nullObjectName, string botName = "Main"
170170

171171
[Conditional("DEBUG")]
172172
[SuppressMessage("ReSharper", "UnusedMember.Global")]
173-
internal static void LogGenericDebug(string message, string botName = "Main", [CallerMemberName] string previousMethodName = null) {
173+
internal static void LogGenericDebug(string message, string botName = Program.ASF, [CallerMemberName] string previousMethodName = null) {
174174
if (string.IsNullOrEmpty(message)) {
175175
LogNullError(nameof(message), botName);
176176
return;

ArchiSteamFarm/Program.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ private enum EMode : byte {
5959
Server // Normal + WCF server
6060
}
6161

62+
internal const string ASF = "ASF";
6263
internal const string ConfigDirectory = "config";
6364
internal const string DebugDirectory = "debug";
6465
internal const string LogFile = "log.txt";
6566

66-
private const string ASF = "ASF";
6767
private const string GithubReleaseURL = "https://api.github.com/repos/" + SharedInfo.GithubRepo + "/releases"; // GitHub API is HTTPS only
6868
private const string GlobalConfigFile = ASF + ".json";
6969
private const string GlobalDatabaseFile = ASF + ".db";
@@ -274,7 +274,7 @@ internal static void Restart() {
274274
Exit();
275275
}
276276

277-
internal static string GetUserInput(EUserInputType userInputType, string botName = "Main", string extraInformation = null) {
277+
internal static string GetUserInput(EUserInputType userInputType, string botName = ASF, string extraInformation = null) {
278278
if (userInputType == EUserInputType.Unknown) {
279279
return null;
280280
}
@@ -386,7 +386,7 @@ private static void InitServices() {
386386
WebBrowser.Init();
387387
WCF.Init();
388388

389-
WebBrowser = new WebBrowser("Main");
389+
WebBrowser = new WebBrowser(ASF);
390390
}
391391

392392
private static void ParseArgs(IEnumerable<string> args) {
@@ -522,7 +522,6 @@ private static void Init(IEnumerable<string> args) {
522522
foreach (string botName in Directory.EnumerateFiles(ConfigDirectory, "*.json").Select(Path.GetFileNameWithoutExtension)) {
523523
switch (botName) {
524524
case ASF:
525-
case "Main":
526525
case "example":
527526
case "minimal":
528527
continue;

ConfigGenerator/MainForm.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ private void MainForm_Load(object sender, EventArgs args) {
6060
string botName = Path.GetFileNameWithoutExtension(configFile);
6161
switch (botName) {
6262
case Program.ASF:
63-
case "Main":
6463
case "example":
6564
case "minimal":
6665
continue;
@@ -163,7 +162,6 @@ private void MainTab_Selected(object sender, TabControlEventArgs args) {
163162

164163
switch (input) {
165164
case Program.ASF:
166-
case "Main":
167165
case "example":
168166
case "minimal":
169167
Logging.LogGenericErrorWithoutStacktrace("This name is reserved!");

0 commit comments

Comments
 (0)