Skip to content

Commit ec51131

Browse files
authored
NLogLogger refactoring to reduce code-path-navigations (#539)
* Fixed various issues reported by EnableNETAnalyzers
1 parent e006c89 commit ec51131

5 files changed

Lines changed: 119 additions & 145 deletions

File tree

src/NLog.Extensions.Logging/Extensions/ConfigureExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public static NLogLoggerProvider Configure(this NLogLoggerProvider nlogProvider,
228228
{
229229
try
230230
{
231-
var result = Convert.ChangeType(configValue.Value, propertyInfo.PropertyType);
231+
var result = Convert.ChangeType(configValue.Value, propertyInfo.PropertyType, System.Globalization.CultureInfo.InvariantCulture);
232232
propertyInfo.SetMethod.Invoke(nlogProvider.Options, new[] { result });
233233
}
234234
catch (Exception ex)

src/NLog.Extensions.Logging/LayoutRenderers/MicrosoftConsoleLayoutRenderer.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace NLog.Extensions.Logging
1212
[ThreadAgnostic]
1313
class MicrosoftConsoleLayoutRenderer : LayoutRenderer
1414
{
15-
private static readonly string[] EventIdMapper = Enumerable.Range(0, 50).Select(id => id.ToString()).ToArray();
15+
private static readonly string[] EventIdMapper = Enumerable.Range(0, 50).Select(id => id.ToString(System.Globalization.CultureInfo.InvariantCulture)).ToArray();
1616

1717
/// <inheritdoc />
1818
protected override void Append(StringBuilder builder, LogEventInfo logEvent)
@@ -21,7 +21,7 @@ protected override void Append(StringBuilder builder, LogEventInfo logEvent)
2121
builder.Append(microsoftLogLevel);
2222
builder.Append(": ");
2323
builder.Append(logEvent.LoggerName);
24-
builder.Append("[");
24+
builder.Append('[');
2525
int eventId = 0;
2626
if (logEvent.HasProperties && logEvent.Properties.TryGetValue("EventId_Id", out var eventIdValue))
2727
{
@@ -35,7 +35,7 @@ protected override void Append(StringBuilder builder, LogEventInfo logEvent)
3535
eventId = 0;
3636
}
3737
builder.Append(ConvertEventId(eventId));
38-
builder.Append("]");
38+
builder.Append(']');
3939
builder.Append(System.Environment.NewLine);
4040
builder.Append(" ");
4141
builder.Append(logEvent.FormattedMessage);
@@ -53,7 +53,7 @@ static string ConvertEventId(int eventId)
5353
else if (eventId > 0 || eventId < EventIdMapper.Length)
5454
return EventIdMapper[eventId];
5555
else
56-
return eventId.ToString();
56+
return eventId.ToString(System.Globalization.CultureInfo.InvariantCulture);
5757
}
5858

5959
string ConvertLogLevel(LogLevel logLevel)

0 commit comments

Comments
 (0)