Merge branch 'feat/log-timestamps' of Common/Utils into ConnectPro_v1.3

This commit is contained in:
Chris Cameron
2019-07-11 14:44:37 +00:00
committed by Gogs
2 changed files with 28 additions and 20 deletions

View File

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [Unreleased]
### Added
- Added logger timestamps to non simplsharp programs
## [9.6.0] - 2019-07-03 ## [9.6.0] - 2019-07-03
### Added ### Added

View File

@@ -29,9 +29,10 @@ namespace ICD.Common.Utils
message = FormatConsoleColor(message, ConsoleColorExtensions.CONSOLE_RED); message = FormatConsoleColor(message, ConsoleColorExtensions.CONSOLE_RED);
ErrorLog.Error(message); ErrorLog.Error(message);
#else #else
System.Console.ForegroundColor = ConsoleColor.Red; Console.Write("Error - {0} - ", IcdEnvironment.GetLocalTime());
System.Console.Error.WriteLine(message); Console.ForegroundColor = ConsoleColor.Red;
System.Console.ResetColor(); Console.Error.WriteLine(message);
Console.ResetColor();
#endif #endif
} }
finally finally
@@ -57,9 +58,10 @@ namespace ICD.Common.Utils
message = FormatConsoleColor(message, ConsoleColorExtensions.CONSOLE_YELLOW); message = FormatConsoleColor(message, ConsoleColorExtensions.CONSOLE_YELLOW);
ErrorLog.Warn(message); ErrorLog.Warn(message);
#else #else
System.Console.ForegroundColor = ConsoleColor.Yellow; Console.Write("Warn - {0} - ", IcdEnvironment.GetLocalTime());
System.Console.Error.WriteLine(message); Console.ForegroundColor = ConsoleColor.Yellow;
System.Console.ResetColor(); Console.Error.WriteLine(message);
Console.ResetColor();
#endif #endif
} }
finally finally
@@ -85,9 +87,10 @@ namespace ICD.Common.Utils
message = FormatConsoleColor(message, ConsoleColorExtensions.CONSOLE_BLUE); message = FormatConsoleColor(message, ConsoleColorExtensions.CONSOLE_BLUE);
ErrorLog.Notice(message); ErrorLog.Notice(message);
#else #else
System.Console.ForegroundColor = ConsoleColor.Blue; Console.Write("Notice - {0} - ", IcdEnvironment.GetLocalTime());
System.Console.Error.WriteLine(message); Console.ForegroundColor = ConsoleColor.Blue;
System.Console.ResetColor(); Console.Error.WriteLine(message);
Console.ResetColor();
#endif #endif
} }
finally finally
@@ -113,9 +116,10 @@ namespace ICD.Common.Utils
message = FormatConsoleColor(message, ConsoleColorExtensions.CONSOLE_GREEN); message = FormatConsoleColor(message, ConsoleColorExtensions.CONSOLE_GREEN);
ErrorLog.Ok(message); ErrorLog.Ok(message);
#else #else
System.Console.ForegroundColor = ConsoleColor.Green; Console.Write("OK - {0} - ", IcdEnvironment.GetLocalTime());
System.Console.Error.WriteLine(message); Console.ForegroundColor = ConsoleColor.Green;
System.Console.ResetColor(); Console.Error.WriteLine(message);
Console.ResetColor();
#endif #endif
} }
finally finally
@@ -141,11 +145,12 @@ namespace ICD.Common.Utils
message = FormatConsoleColor(message, ConsoleColorExtensions.CONSOLE_YELLOW_ON_RED_BACKGROUND); message = FormatConsoleColor(message, ConsoleColorExtensions.CONSOLE_YELLOW_ON_RED_BACKGROUND);
ErrorLog.Exception(message, ex); ErrorLog.Exception(message, ex);
#else #else
System.Console.ForegroundColor = ConsoleColor.Yellow; Console.Write("Except - {0} - ", IcdEnvironment.GetLocalTime());
System.Console.BackgroundColor = ConsoleColor.Red; Console.ForegroundColor = ConsoleColor.Yellow;
System.Console.Error.WriteLine("{0}: {1}", ex.GetType().Name, message); Console.BackgroundColor = ConsoleColor.Red;
System.Console.ResetColor(); Console.Error.WriteLine("{0}: {1}", ex.GetType().Name, message);
System.Console.Error.WriteLine(ex.StackTrace); Console.ResetColor();
Console.Error.WriteLine(ex.StackTrace);
#endif #endif
} }
finally finally
@@ -172,9 +177,10 @@ namespace ICD.Common.Utils
message = FormatConsoleColor(message, ConsoleColorExtensions.CONSOLE_CYAN); message = FormatConsoleColor(message, ConsoleColorExtensions.CONSOLE_CYAN);
ErrorLog.Info(message); ErrorLog.Info(message);
#else #else
System.Console.ForegroundColor = ConsoleColor.Cyan; Console.Write("Info - {0} - ", IcdEnvironment.GetLocalTime());
System.Console.Error.WriteLine(message); Console.ForegroundColor = ConsoleColor.Cyan;
System.Console.ResetColor(); Console.Error.WriteLine(message);
Console.ResetColor();
#endif #endif
} }
finally finally