diff --git a/BSBshared/BotTypes/BasicBot.cs b/BSBshared/BotTypes/BasicBot.cs index 52b851b..0e3ab64 100644 --- a/BSBshared/BotTypes/BasicBot.cs +++ b/BSBshared/BotTypes/BasicBot.cs @@ -281,23 +281,23 @@ namespace BetterSecondBotShared.bottypes public virtual void Warn(string message) { - Log2File(LogFormater.Warn(message), ConsoleLogLogLevel.Warn); + Log2File(LogFormater.Warn(message,false), ConsoleLogLogLevel.Warn); } public virtual void Crit(string message) { - Log2File(LogFormater.Crit(message), ConsoleLogLogLevel.Crit); + Log2File(LogFormater.Crit(message, false), ConsoleLogLogLevel.Crit); } public virtual void Info(string message) { - Log2File(LogFormater.Info(message), ConsoleLogLogLevel.Info); + Log2File(LogFormater.Info(message, false), ConsoleLogLogLevel.Info); } public virtual void Status(string message) { - Log2File(LogFormater.Status(message), ConsoleLogLogLevel.Status); + Log2File(LogFormater.Status(message, false), ConsoleLogLogLevel.Status); } public virtual void Debug(string message) { - Log2File(LogFormater.Debug(message), ConsoleLogLogLevel.Debug); + Log2File(LogFormater.Debug(message, false), ConsoleLogLogLevel.Debug); } public virtual void Log2File(string message, ConsoleLogLogLevel Level) diff --git a/BSBshared/Staic/LogFormater.cs b/BSBshared/Staic/LogFormater.cs index 536d070..d5cb952 100644 --- a/BSBshared/Staic/LogFormater.cs +++ b/BSBshared/Staic/LogFormater.cs @@ -13,27 +13,27 @@ namespace BetterSecondBotShared.logs }; public static class LogFormater { - public static string Warn(string message) + public static string Warn(string message,bool send_to_console=true) { - return Add(message, ConsoleLogLogLevel.Warn); + return Add(message, ConsoleLogLogLevel.Warn, send_to_console); } - public static string Crit(string message) + public static string Crit(string message, bool send_to_console = true) { - return Add(message, ConsoleLogLogLevel.Crit); + return Add(message, ConsoleLogLogLevel.Crit, send_to_console); } - public static string Info(string message) + public static string Info(string message, bool send_to_console = true) { - return Add(message, ConsoleLogLogLevel.Info); + return Add(message, ConsoleLogLogLevel.Info, send_to_console); } - public static string Status(string message) + public static string Status(string message, bool send_to_console = true) { - return Add(message, ConsoleLogLogLevel.Status); + return Add(message, ConsoleLogLogLevel.Status, send_to_console); } - public static string Debug(string message) + public static string Debug(string message, bool send_to_console = true) { - return Add(message, ConsoleLogLogLevel.Debug); + return Add(message, ConsoleLogLogLevel.Debug, send_to_console); } - private static string Add(string message, ConsoleLogLogLevel Level) + private static string Add(string message, ConsoleLogLogLevel Level, bool send_to_console = true) { var date = DateTime.Now; StringBuilder n = new StringBuilder(); @@ -86,6 +86,10 @@ namespace BetterSecondBotShared.logs } } n.Append(message); + if(send_to_console == true) + { + Console.WriteLine(n.ToString()); + } return n.ToString(); } } diff --git a/CLI/CliHardware.cs b/CLI/CliHardware.cs index 4c3d862..d677637 100644 --- a/CLI/CliHardware.cs +++ b/CLI/CliHardware.cs @@ -18,7 +18,7 @@ namespace BetterSecondBot LogFormater.Status("Hardware/Debug version"); json_file = "debug.json"; #else - Status("Hardware/Live version"); + LogFormater.Status("Hardware/Live version"); if(args.Length == 1) { json_file = ""+args[0]+".json"; @@ -26,7 +26,7 @@ namespace BetterSecondBot else { json_file = "mybot.json"; - Warn("Using: mybot.json as the config"); + LogFormater.Warn("Using: mybot.json as the config"); } #endif