2
2
// Licensed under the MIT License.
3
3
4
4
using System ;
5
- using System . Data ;
6
5
using System . Diagnostics . CodeAnalysis ;
7
6
using System . Diagnostics . Tracing ;
8
7
using System . Globalization ;
9
8
using System . Linq ;
10
- using System . Text . RegularExpressions ;
11
9
using Microsoft . IdentityModel . Abstractions ;
12
10
13
11
namespace Microsoft . IdentityModel . Logging
@@ -260,9 +258,9 @@ public static Exception LogExceptionMessage(EventLevel eventLevel, Exception exc
260
258
if ( IdentityModelEventSource . Logger . IsEnabled ( ) && IdentityModelEventSource . Logger . LogLevel >= eventLevel )
261
259
IdentityModelEventSource . Logger . Write ( eventLevel , exception . InnerException , exception . Message ) ;
262
260
263
- EventLogLevel eventLogLevel = Enum . IsDefined ( typeof ( EventLogLevel ) , ( int ) eventLevel ) ? ( EventLogLevel ) eventLevel : EventLogLevel . Error ;
261
+ EventLogLevel eventLogLevel = EventLevelToEventLogLevel ( eventLevel ) ;
264
262
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 ) ) ;
266
264
267
265
return exception ;
268
266
}
@@ -277,8 +275,8 @@ public static void LogInformation(string message, params object[] args)
277
275
if ( IdentityModelEventSource . Logger . IsEnabled ( ) && IdentityModelEventSource . Logger . LogLevel >= EventLevel . Informational )
278
276
IdentityModelEventSource . Logger . WriteInformation ( message , args ) ;
279
277
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 ) ) ;
282
280
}
283
281
284
282
/// <summary>
@@ -291,8 +289,8 @@ public static void LogVerbose(string message, params object[] args)
291
289
if ( IdentityModelEventSource . Logger . IsEnabled ( ) )
292
290
IdentityModelEventSource . Logger . WriteVerbose ( message , args ) ;
293
291
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 ) ) ;
296
294
}
297
295
298
296
/// <summary>
@@ -305,8 +303,8 @@ public static void LogWarning(string message, params object[] args)
305
303
if ( IdentityModelEventSource . Logger . IsEnabled ( ) )
306
304
IdentityModelEventSource . Logger . WriteWarning ( message , args ) ;
307
305
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 ) ) ;
310
308
}
311
309
312
310
/// <summary>
@@ -319,8 +317,7 @@ public static void LogWarning(string message, params object[] args)
319
317
/// <param name="args">An object array that contains zero or more objects to format.</param>
320
318
private static T LogExceptionImpl < [ DynamicallyAccessedMembers ( DynamicallyAccessedMemberTypes . PublicConstructors ) ] T > ( EventLevel eventLevel , string argumentName , Exception innerException , string format , params object [ ] args ) where T : Exception
321
319
{
322
- string message = null ;
323
-
320
+ string message ;
324
321
if ( args != null )
325
322
message = string . Format ( CultureInfo . InvariantCulture , format , args ) ;
326
323
else
@@ -329,9 +326,9 @@ public static void LogWarning(string message, params object[] args)
329
326
if ( IdentityModelEventSource . Logger . IsEnabled ( ) && IdentityModelEventSource . Logger . LogLevel >= eventLevel )
330
327
IdentityModelEventSource . Logger . Write ( eventLevel , innerException , message ) ;
331
328
332
- EventLogLevel eventLogLevel = Enum . IsDefined ( typeof ( EventLogLevel ) , ( int ) eventLevel ) ? ( EventLogLevel ) eventLevel : EventLogLevel . Error ;
329
+ EventLogLevel eventLogLevel = EventLevelToEventLogLevel ( eventLevel ) ;
333
330
if ( Logger . IsEnabled ( eventLogLevel ) )
334
- Logger . Log ( WriteEntry ( ( EventLogLevel ) eventLevel , innerException , message , null ) ) ;
331
+ Logger . Log ( WriteEntry ( eventLogLevel , innerException , message , null ) ) ;
335
332
336
333
if ( innerException != null )
337
334
if ( string . IsNullOrEmpty ( argumentName ) )
@@ -345,6 +342,9 @@ public static void LogWarning(string message, params object[] args)
345
342
return ( T ) Activator . CreateInstance ( typeof ( T ) , argumentName , message ) ;
346
343
}
347
344
345
+ private static EventLogLevel EventLevelToEventLogLevel ( EventLevel eventLevel ) =>
346
+ ( uint ) ( int ) eventLevel <= 5 ? ( EventLogLevel ) eventLevel : EventLogLevel . Error ;
347
+
348
348
/// <summary>
349
349
/// Formats the string using InvariantCulture
350
350
/// </summary>
0 commit comments