pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-02-16 21:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: LogError message forwards to LogMessage

Browse Source 
Console overload with ErrorLogLevel parameter also forwards directly to LogMessage and skips LogError method
This commit is contained in:
Andrew Welker
2024-05-14 22:17:01 -05:00
parent 165841b802
commit ed66be3dd9
1 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Pepperdash Core/Logging/Debug.cs
View File

@@ -187,7 +187,7 @@ namespace PepperDash.Core
CrestronConsole.PrintLine(msg); CrestronConsole.PrintLine(msg);
LogError(ErrorLogLevel.Notice, msg); LogMessage(LogEventLevel.Information,msg);
IncludedExcludedKeys = new Dictionary<string, object>(); IncludedExcludedKeys = new Dictionary<string, object>();
@@ -692,24 +692,7 @@ namespace PepperDash.Core
public static void Console(uint level, IKeyed dev, ErrorLogLevel errorLogLevel, public static void Console(uint level, IKeyed dev, ErrorLogLevel errorLogLevel,
string format, params object[] items) string format, params object[] items)
{ {
var str = string.Format("[{0}] {1}", dev.Key, string.Format(format, items));
if (errorLogLevel != ErrorLogLevel.None)
{
LogError(errorLogLevel, str);
}
LogMessage(level, dev, format, items); LogMessage(level, dev, format, items);
//var log = _logger.ForContext("Key", dev.Key);
//var message = string.Format(format, items);
//log.Write((LogEventLevel)level, message);
//if (Level >= level)
//{
// Console(level, str);
//}
} }
/// <summary> /// <summary>
@@ -719,17 +702,7 @@ namespace PepperDash.Core
public static void Console(uint level, ErrorLogLevel errorLogLevel, public static void Console(uint level, ErrorLogLevel errorLogLevel,
string format, params object[] items) string format, params object[] items)
{ {
var str = string.Format(format, items);
if (errorLogLevel != ErrorLogLevel.None)
{
LogError(errorLogLevel, str);
}
LogMessage(level, format, items); LogMessage(level, format, items);
//if (Level >= level)
//{
// Console(level, str);
//}
} }
/// <summary> /// <summary>
@@ -770,18 +743,16 @@ namespace PepperDash.Core
[Obsolete("Use LogMessage methods")] [Obsolete("Use LogMessage methods")]
public static void LogError(ErrorLogLevel errorLogLevel, string str) public static void LogError(ErrorLogLevel errorLogLevel, string str)
{ {
var msg = IsRunningOnAppliance ? string.Format("App {0}:{1}", InitialParametersClass.ApplicationNumber, str) : string.Format("Room {0}:{1}", InitialParametersClass.RoomId, str);
switch (errorLogLevel) switch (errorLogLevel)
{ {
case ErrorLogLevel.Error: case ErrorLogLevel.Error:
ErrorLog.Error(msg); LogMessage(LogEventLevel.Error, str);
break; break;
case ErrorLogLevel.Warning: case ErrorLogLevel.Warning:
ErrorLog.Warn(msg); LogMessage(LogEventLevel.Warning, str);
break; break;
case ErrorLogLevel.Notice: case ErrorLogLevel.Notice:
ErrorLog.Notice(msg); LogMessage(LogEventLevel.Information, str);
break; break;
} }
} }