Skip to content

Commit e557263

Browse files
committed
Parametrizing the logging calls to allow delayed string evaluation (saving a bit of CPU when the logging level is lower and the message is not processed)
1 parent fe62163 commit e557263

5 files changed

Lines changed: 22 additions & 22 deletions

File tree

Source/ModuleManager/Logging/IBasicLogger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace ModuleManager.Logging
2424
public interface IBasicLogger
2525
{
2626
void Log(K.Level logType, string message, params object[] @params);
27-
void Exception(Exception exception, string message);
27+
void Exception(Exception exception, string message, params object[] @params);
2828
void Finish();
2929
}
3030
}

Source/ModuleManager/Logging/ModLogger.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class ModLogger : IBasicLogger
2525
internal static readonly ModLogger Instance = new ModLogger(); // For legacy code
2626
internal static bool DebugMode => KSPe.Globals<ModuleManager>.DebugMode;
2727

28-
private delegate void LogMethod(string message, params object[] @parms);
28+
private delegate void LogMethod(string message, params object[] @params);
2929
private readonly LogMethod[] methods;
3030
private ModLogger()
3131
{
@@ -41,9 +41,9 @@ private ModLogger()
4141

4242
public void Log(K.Level logType, string message, params object[] @params) => this.methods[(int)logType](message, @params);
4343

44-
public void Exception(Exception exception, string message)
44+
public void Exception(Exception exception, string message, params object[] @params)
4545
{
46-
LOG.error(exception, message);
46+
LOG.error(exception, message, @params);
4747
}
4848

4949
public void Finish() { }

Source/ModuleManager/Logging/PatchLogger.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class PatchLogger : IBasicLogger
2424
internal readonly K.Logger log;
2525
internal static bool DebugMode => KSPe.Globals<ModuleManager>.DebugMode;
2626

27-
private delegate void LogMethod(string message, params object[] @parms);
27+
private delegate void LogMethod(string message, params object[] @params);
2828
private readonly LogMethod[] methods;
2929
internal PatchLogger(string filename)
3030
{
@@ -43,9 +43,9 @@ internal PatchLogger(string filename)
4343

4444
public void Log(K.Level logType, string message, object[] @params) => this.methods[(int)logType](message, @params);
4545

46-
public void Exception(Exception exception, string message)
46+
public void Exception(Exception exception, string message, params object[] @params)
4747
{
48-
this.log.error(exception, message);
48+
this.log.error(exception, message, @params);
4949
}
5050

5151
public void Finish()

Source/ModuleManager/Progress/IPatchProgress.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ public interface IPatchProgress
2525
EventVoid OnPatchApplied { get; }
2626
EventData<IPass> OnPassStarted { get; }
2727

28-
void Warning(UrlDir.UrlConfig url, string message);
29-
void Error(UrlDir.UrlConfig url, string message);
30-
void Error(string message);
31-
void Exception(Exception exception, string message);
32-
void Exception(Exception exception, UrlDir.UrlConfig url, string message);
28+
void Warning(UrlDir.UrlConfig url, string message, params object[] @params);
29+
void Error(UrlDir.UrlConfig url, string message, params object[] @params);
30+
void Error(string message, params object[] @params);
31+
void Exception(Exception exception, string message, params object[] @params);
32+
void Exception(Exception exception, UrlDir.UrlConfig url, string message, params object[] @params);
3333
void NeedsUnsatisfiedRoot(UrlDir.UrlConfig url);
3434
void NeedsUnsatisfiedNode(UrlDir.UrlConfig url, string path);
3535
void NeedsUnsatisfiedValue(UrlDir.UrlConfig url, string path);

Source/ModuleManager/Progress/PatchProgress.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,35 +115,35 @@ public void NeedsUnsatisfiedAfter(UrlDir.UrlConfig url)
115115
Counter.needsUnsatisfied.Increment();
116116
}
117117

118-
public void Warning(UrlDir.UrlConfig url, string message)
118+
public void Warning(UrlDir.UrlConfig url, string message, params object[] @params)
119119
{
120120
Counter.warnings.Increment();
121-
logger.Warning(message);
121+
logger.Warning(message, @params);
122122
RecordWarningFile(url);
123123
}
124124

125-
public void Error(UrlDir.UrlConfig url, string message)
125+
public void Error(UrlDir.UrlConfig url, string message, params object[] @params)
126126
{
127127
Counter.errors.Increment();
128-
logger.Error(message);
128+
logger.Error(message, @params);
129129
RecordErrorFile(url);
130130
}
131131

132-
public void Error(string message)
132+
public void Error(string message, params object[] @params)
133133
{
134134
Counter.errors.Increment();
135-
logger.Error(message);
135+
logger.Error(message, @params);
136136
}
137137

138-
public void Exception(Exception exception, string message)
138+
public void Exception(Exception exception, string message, params object[] @params)
139139
{
140140
Counter.exceptions.Increment();
141-
logger.Exception(exception, message);
141+
logger.Exception(exception, message, @params);
142142
}
143143

144-
public void Exception(Exception exception, UrlDir.UrlConfig url, string message)
144+
public void Exception(Exception exception, UrlDir.UrlConfig url, string message, params object[] @params)
145145
{
146-
Exception(exception, message);
146+
Exception(exception, message, @params);
147147
RecordErrorFile(url);
148148
}
149149

0 commit comments

Comments
 (0)