diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs index 77196d127..59ab14a16 100644 --- a/ArchiSteamFarm/ArchiWebHandler.cs +++ b/ArchiSteamFarm/ArchiWebHandler.cs @@ -434,7 +434,7 @@ namespace ArchiSteamFarm { } if (response == null) { - Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName); + Logging.LogGenericWarning("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName); return null; } @@ -473,7 +473,7 @@ namespace ArchiSteamFarm { return (uint) response["server_time"].AsUnsignedLong(); } - Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName); + Logging.LogGenericWarning("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName); return 0; } @@ -556,7 +556,7 @@ namespace ArchiSteamFarm { } if (response == null) { - Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName); + Logging.LogGenericWarning("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName); return null; } @@ -695,7 +695,7 @@ namespace ArchiSteamFarm { return true; } - Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName); + Logging.LogGenericWarning("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName); return false; } diff --git a/ArchiSteamFarm/Logging.cs b/ArchiSteamFarm/Logging.cs index 05a2393d7..714416571 100644 --- a/ArchiSteamFarm/Logging.cs +++ b/ArchiSteamFarm/Logging.cs @@ -74,15 +74,6 @@ namespace ArchiSteamFarm { internal static void OnUserInputStart() => LogManager.DisableLogging(); internal static void OnUserInputEnd() => LogManager.EnableLogging(); - internal static void LogGenericWTF(string message, string botName = "Main", [CallerMemberName] string previousMethodName = null) { - if (string.IsNullOrEmpty(message)) { - LogNullError(nameof(message), botName); - return; - } - - Logger.Error($"{botName}|{previousMethodName}() {message}"); - } - internal static void LogGenericError(string message, string botName = "Main", [CallerMemberName] string previousMethodName = null) { if (string.IsNullOrEmpty(message)) { LogNullError(nameof(message), botName); @@ -128,12 +119,13 @@ namespace ArchiSteamFarm { Logger.Info($"{botName}|{previousMethodName}() {message}"); } + [SuppressMessage("ReSharper", "ExplicitCallerInfoArgument")] internal static void LogNullError(string nullObjectName, string botName = "Main", [CallerMemberName] string previousMethodName = null) { if (string.IsNullOrEmpty(nullObjectName)) { return; } - Logger.Error($"{botName}|{previousMethodName}() {nullObjectName} is null!"); + LogGenericError(nullObjectName + " is null!", botName, previousMethodName); } [Conditional("DEBUG")] diff --git a/ArchiSteamFarm/WebBrowser.cs b/ArchiSteamFarm/WebBrowser.cs index 27f47cb57..0fbc73ec6 100644 --- a/ArchiSteamFarm/WebBrowser.cs +++ b/ArchiSteamFarm/WebBrowser.cs @@ -100,7 +100,7 @@ namespace ArchiSteamFarm { return true; } - Logging.LogGenericWTF("Request failed even after " + MaxRetries + " tries", Identifier); + Logging.LogGenericWarning("Request failed even after " + MaxRetries + " tries", Identifier); return false; } @@ -119,7 +119,7 @@ namespace ArchiSteamFarm { return result; } - Logging.LogGenericWTF("Request failed even after " + MaxRetries + " tries", Identifier); + Logging.LogGenericWarning("Request failed even after " + MaxRetries + " tries", Identifier); return null; } @@ -138,7 +138,7 @@ namespace ArchiSteamFarm { return result; } - Logging.LogGenericWTF("Request failed even after " + MaxRetries + " tries", Identifier); + Logging.LogGenericWarning("Request failed even after " + MaxRetries + " tries", Identifier); return null; } @@ -157,7 +157,7 @@ namespace ArchiSteamFarm { return result; } - Logging.LogGenericWTF("Request failed even after " + MaxRetries + " tries", Identifier); + Logging.LogGenericWarning("Request failed even after " + MaxRetries + " tries", Identifier); return null; } @@ -176,7 +176,7 @@ namespace ArchiSteamFarm { return result; } - Logging.LogGenericWTF("Request failed even after " + MaxRetries + " tries", Identifier); + Logging.LogGenericWarning("Request failed even after " + MaxRetries + " tries", Identifier); return null; } @@ -195,7 +195,7 @@ namespace ArchiSteamFarm { return result; } - Logging.LogGenericWTF("Request failed even after " + MaxRetries + " tries", Identifier); + Logging.LogGenericWarning("Request failed even after " + MaxRetries + " tries", Identifier); return null; } @@ -214,7 +214,7 @@ namespace ArchiSteamFarm { return result; } - Logging.LogGenericWTF("Request failed even after " + MaxRetries + " tries", Identifier); + Logging.LogGenericWarning("Request failed even after " + MaxRetries + " tries", Identifier); return null; } @@ -233,7 +233,7 @@ namespace ArchiSteamFarm { return true; } - Logging.LogGenericWTF("Request failed even after " + MaxRetries + " tries", Identifier); + Logging.LogGenericWarning("Request failed even after " + MaxRetries + " tries", Identifier); return false; }