Skip to content

Commit 5fa27d3

Browse files
committed
Fix ConsoleLogger to only format messages when arguments are provided (#207)
1 parent 8ace14a commit 5fa27d3

File tree

1 file changed

+45
-5
lines changed

1 file changed

+45
-5
lines changed

DiscordRPC/Logging/ConsoleLogger.cs

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,18 @@ public void Trace(string message, params object[] args)
6969
if (Level > LogLevel.Trace) return;
7070

7171
if (Coloured) Console.ForegroundColor = ConsoleColor.Gray;
72-
Console.WriteLine("TRACE: " + message, args);
73-
}
72+
73+
string prefixedMessage = "TRACE: " + message;
74+
75+
if (args.Length > 0)
76+
{
77+
Console.WriteLine(prefixedMessage, args);
78+
}
79+
else
80+
{
81+
Console.WriteLine(prefixedMessage);
82+
}
83+
}
7484

7585
/// <summary>
7686
/// Informative log messages
@@ -82,7 +92,17 @@ public void Info(string message, params object[] args)
8292
if (Level > LogLevel.Info) return;
8393

8494
if (Coloured) Console.ForegroundColor = ConsoleColor.White;
85-
Console.WriteLine("INFO: " + message, args);
95+
96+
string prefixedMessage = "INFO: " + message;
97+
98+
if (args.Length > 0)
99+
{
100+
Console.WriteLine(prefixedMessage, args);
101+
}
102+
else
103+
{
104+
Console.WriteLine(prefixedMessage);
105+
}
86106
}
87107

88108
/// <summary>
@@ -95,7 +115,17 @@ public void Warning(string message, params object[] args)
95115
if (Level > LogLevel.Warning) return;
96116

97117
if (Coloured) Console.ForegroundColor = ConsoleColor.Yellow;
98-
Console.WriteLine("WARN: " + message, args);
118+
119+
string prefixedMessage = "WARN: " + message;
120+
121+
if (args.Length > 0)
122+
{
123+
Console.WriteLine(prefixedMessage, args);
124+
}
125+
else
126+
{
127+
Console.WriteLine(prefixedMessage);
128+
}
99129
}
100130

101131
/// <summary>
@@ -108,7 +138,17 @@ public void Error(string message, params object[] args)
108138
if (Level > LogLevel.Error) return;
109139

110140
if (Coloured) Console.ForegroundColor = ConsoleColor.Red;
111-
Console.WriteLine("ERR : " + message, args);
141+
142+
string prefixedMessage = "ERR : " + message;
143+
144+
if (args.Length > 0)
145+
{
146+
Console.WriteLine(prefixedMessage, args);
147+
}
148+
else
149+
{
150+
Console.WriteLine(prefixedMessage);
151+
}
112152
}
113153

114154
}

0 commit comments

Comments
 (0)