Skip to content

Commit 5f1248b

Browse files
stephentoubBrent Schmaltz
authored and
Brent Schmaltz
committed
Avoid unnecessary boxing in LogHelper (#2161)
* Avoid unnecessary boxing in LogHelper * Update src/Microsoft.IdentityModel.Logging/LogHelper.cs
1 parent f215234 commit 5f1248b

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

src/Microsoft.IdentityModel.Logging/LogHelper.cs

+14-14
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
// Licensed under the MIT License.
33

44
using System;
5-
using System.Data;
65
using System.Diagnostics.CodeAnalysis;
76
using System.Diagnostics.Tracing;
87
using System.Globalization;
98
using System.Linq;
10-
using System.Text.RegularExpressions;
119
using Microsoft.IdentityModel.Abstractions;
1210

1311
namespace Microsoft.IdentityModel.Logging
@@ -260,9 +258,9 @@ public static Exception LogExceptionMessage(EventLevel eventLevel, Exception exc
260258
if (IdentityModelEventSource.Logger.IsEnabled() && IdentityModelEventSource.Logger.LogLevel >= eventLevel)
261259
IdentityModelEventSource.Logger.Write(eventLevel, exception.InnerException, exception.Message);
262260

263-
EventLogLevel eventLogLevel = Enum.IsDefined(typeof(EventLogLevel), (int)eventLevel) ? (EventLogLevel)eventLevel : EventLogLevel.Error;
261+
EventLogLevel eventLogLevel = EventLevelToEventLogLevel(eventLevel);
264262
if (Logger.IsEnabled(eventLogLevel))
265-
Logger.Log(WriteEntry((EventLogLevel)eventLevel, exception.InnerException, exception.Message, null));
263+
Logger.Log(WriteEntry(eventLogLevel, exception.InnerException, exception.Message, null));
266264

267265
return exception;
268266
}
@@ -277,8 +275,8 @@ public static void LogInformation(string message, params object[] args)
277275
if (IdentityModelEventSource.Logger.IsEnabled() && IdentityModelEventSource.Logger.LogLevel >= EventLevel.Informational)
278276
IdentityModelEventSource.Logger.WriteInformation(message, args);
279277

280-
if (Enum.IsDefined(typeof(EventLogLevel), (int)EventLevel.Informational) && Logger.IsEnabled((EventLogLevel)EventLevel.Informational))
281-
Logger.Log(WriteEntry((EventLogLevel)EventLevel.Informational, null, message, args));
278+
if (Logger.IsEnabled(EventLogLevel.Informational))
279+
Logger.Log(WriteEntry(EventLogLevel.Informational, null, message, args));
282280
}
283281

284282
/// <summary>
@@ -291,8 +289,8 @@ public static void LogVerbose(string message, params object[] args)
291289
if (IdentityModelEventSource.Logger.IsEnabled())
292290
IdentityModelEventSource.Logger.WriteVerbose(message, args);
293291

294-
if (Enum.IsDefined(typeof(EventLogLevel), (int)EventLevel.Verbose) && Logger.IsEnabled((EventLogLevel)EventLevel.Verbose))
295-
Logger.Log(WriteEntry((EventLogLevel)EventLevel.Verbose, null, message, args));
292+
if (Logger.IsEnabled(EventLogLevel.Verbose))
293+
Logger.Log(WriteEntry(EventLogLevel.Verbose, null, message, args));
296294
}
297295

298296
/// <summary>
@@ -305,8 +303,8 @@ public static void LogWarning(string message, params object[] args)
305303
if (IdentityModelEventSource.Logger.IsEnabled())
306304
IdentityModelEventSource.Logger.WriteWarning(message, args);
307305

308-
if (Enum.IsDefined(typeof(EventLogLevel), (int)EventLevel.Warning) && Logger.IsEnabled((EventLogLevel)EventLevel.Warning))
309-
Logger.Log(WriteEntry((EventLogLevel)EventLevel.Warning, null, message, args));
306+
if (Logger.IsEnabled(EventLogLevel.Warning))
307+
Logger.Log(WriteEntry(EventLogLevel.Warning, null, message, args));
310308
}
311309

312310
/// <summary>
@@ -319,8 +317,7 @@ public static void LogWarning(string message, params object[] args)
319317
/// <param name="args">An object array that contains zero or more objects to format.</param>
320318
private static T LogExceptionImpl<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(EventLevel eventLevel, string argumentName, Exception innerException, string format, params object[] args) where T : Exception
321319
{
322-
string message = null;
323-
320+
string message;
324321
if (args != null)
325322
message = string.Format(CultureInfo.InvariantCulture, format, args);
326323
else
@@ -329,9 +326,9 @@ public static void LogWarning(string message, params object[] args)
329326
if (IdentityModelEventSource.Logger.IsEnabled() && IdentityModelEventSource.Logger.LogLevel >= eventLevel)
330327
IdentityModelEventSource.Logger.Write(eventLevel, innerException, message);
331328

332-
EventLogLevel eventLogLevel = Enum.IsDefined(typeof(EventLogLevel), (int)eventLevel) ? (EventLogLevel)eventLevel : EventLogLevel.Error;
329+
EventLogLevel eventLogLevel = EventLevelToEventLogLevel(eventLevel);
333330
if (Logger.IsEnabled(eventLogLevel))
334-
Logger.Log(WriteEntry((EventLogLevel)eventLevel, innerException, message, null));
331+
Logger.Log(WriteEntry(eventLogLevel, innerException, message, null));
335332

336333
if (innerException != null)
337334
if (string.IsNullOrEmpty(argumentName))
@@ -345,6 +342,9 @@ public static void LogWarning(string message, params object[] args)
345342
return (T)Activator.CreateInstance(typeof(T), argumentName, message);
346343
}
347344

345+
private static EventLogLevel EventLevelToEventLogLevel(EventLevel eventLevel) =>
346+
(uint)(int)eventLevel <= 5 ? (EventLogLevel)eventLevel : EventLogLevel.Error;
347+
348348
/// <summary>
349349
/// Formats the string using InvariantCulture
350350
/// </summary>

0 commit comments

Comments
 (0)