michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fixed string formatting in logger

Browse Source
This commit is contained in:
LukePulverenti Luke Pulverenti luke pulverenti 2012-08-06 09:21:14 -04:00
parent 307d725714
commit 2b188c4ac9
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
MediaBrowser.Common/Logging/BaseLogger.cs
View File

@ -26,7 +26,7 @@ namespace MediaBrowser.Common.Logging
public void LogException(string message, Exception exception, params object[] paramList) public void LogException(string message, Exception exception, params object[] paramList)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (exception != null) if (exception != null)
{ {
builder.AppendFormat("Exception. Type={0} Msg={1} StackTrace={3}{2}", builder.AppendFormat("Exception. Type={0} Msg={1} StackTrace={3}{2}",
@ -36,7 +36,7 @@ namespace MediaBrowser.Common.Logging
Environment.NewLine); Environment.NewLine);
} }
message = string.Format(message, paramList); message = FormatMessage(message, paramList);
LogError(string.Format("{0} ( {1} )", message, builder)); LogError(string.Format("{0} ( {1} )", message, builder));
} }
@ -46,11 +46,24 @@ namespace MediaBrowser.Common.Logging
LogEntry(message, LogSeverity.Warning, paramList); LogEntry(message, LogSeverity.Warning, paramList);
} }
private string FormatMessage(string message, params object[] paramList)
{
if (paramList != null)
{
for (int i = 0; i < paramList.Length; i++)
{
message = message.Replace("{" + i + "}", paramList[i].ToString());
}
}
return message;
}
private void LogEntry(string message, LogSeverity severity, params object[] paramList) private void LogEntry(string message, LogSeverity severity, params object[] paramList)
{ {
if (severity < LogSeverity) return; if (severity < LogSeverity) return;
message = string.Format(message, paramList); message = FormatMessage(message, paramList);
Thread currentThread = Thread.CurrentThread; Thread currentThread = Thread.CurrentThread;