1- using Exceptionless . Models ;
2- using Microsoft . Extensions . Logging ;
3- using System ;
1+ using System ;
42using System . Collections . Generic ;
3+ using ExceptionlessLogLevel = Exceptionless . Logging . LogLevel ;
4+ using Microsoft . Extensions . Logging ;
55
6- namespace Exceptionless . Extensions . Logging
7- {
8- public class ExceptionlessLogger : ILogger
9- {
10- static readonly Dictionary < LogLevel , string > LOG_LEVELS = MapLogLevelsToExceptionlessNames ( ) ;
11-
12- static Dictionary < LogLevel , string > MapLogLevelsToExceptionlessNames ( )
13- {
14- Dictionary < LogLevel , string > mappings = new Dictionary < LogLevel , string > ( 7 ) ;
15- mappings . Add ( LogLevel . Critical , global Exceptionless . Logging . LogLevel . Fatal . ToString ( ) ) ;
16- mappings . Add ( LogLevel . Debug , global Exceptionless . Logging . LogLevel . Debug . ToString ( ) ) ;
17- mappings . Add ( LogLevel . Error , global Exceptionless . Logging . LogLevel . Error . ToString ( ) ) ;
18- mappings . Add ( LogLevel . Information , global Exceptionless . Logging . LogLevel . Info . ToString ( ) ) ;
19- mappings . Add ( LogLevel . None , global Exceptionless . Logging . LogLevel . Off . ToString ( ) ) ;
20- mappings . Add ( LogLevel . Trace , global Exceptionless . Logging . LogLevel . Trace . ToString ( ) ) ;
21- mappings . Add ( LogLevel . Warning , global Exceptionless . Logging . LogLevel . Warn . ToString ( ) ) ;
22-
23- return mappings ;
24- }
25-
26- ExceptionlessClient _Client ;
27- string _Source ;
6+ namespace Exceptionless . Extensions . Logging {
7+ public class ExceptionlessLogger : ILogger {
8+ private readonly ExceptionlessClient _client ;
9+ private readonly string _source ;
2810
2911 /// <summary>
3012 /// Initializes a new instance of the <see cref="ExceptionlessLogger"/> class.
3113 /// </summary>
3214 /// <param name="client">The <see cref="ExceptionlessClient"/> to be used by the logger.</param>
3315 /// <param name="source">The source to tag events with, typically the category.</param>
34- public ExceptionlessLogger ( ExceptionlessClient client , string source )
35- {
36- if ( client == null )
37- throw new ArgumentNullException ( nameof ( client ) ) ;
38-
39- _Client = client ;
40- _Source = source ;
16+ public ExceptionlessLogger ( ExceptionlessClient client , string source ) {
17+ _client = client ?? throw new ArgumentNullException ( nameof ( client ) ) ;
18+ _source = source ;
4119 }
4220
21+ /// <inheritdoc />
4322 /// <summary>
4423 /// Begins a logical operation scope.
4524 /// </summary>The identifier for the scope.
4625 /// <typeparam name="TState">The type of the state object.</typeparam>
4726 /// <param name="state"></param>
48- /// <returns>An <see cref="IDisposable"/> that ends the logical operation scope on dispose.</returns>
49- public IDisposable BeginScope < TState > ( TState state )
50- {
27+ /// <returns>An <see cref="T:System.IDisposable" /> that ends the logical operation scope on dispose.</returns>
28+ public IDisposable BeginScope < TState > ( TState state ) {
5129 if ( state == null )
5230 throw new ArgumentNullException ( nameof ( state ) ) ;
5331
@@ -59,24 +37,29 @@ public IDisposable BeginScope<TState>(TState state)
5937 object stateObj = state is string ? null : ( object ) state ;
6038
6139 // Log scope creation as an event so that there is a parent to tie events together
62- ExceptionlessLoggingScope scope = new ExceptionlessLoggingScope ( description ) ;
40+ var scope = new ExceptionlessLoggingScope ( description ) ;
6341 LogScope ( scope , stateObj ) ;
6442
6543 // Add to stack to support nesting within execution context
6644 ExceptionlessLoggingScope . Push ( scope ) ;
6745 return scope ;
6846 }
6947
48+ /// <inheritdoc />
7049 /// <summary>
71- /// Checks if the given <see cref="LogLevel"/> is enabled.
50+ /// Checks if the given <see cref="T:Microsoft.Extensions.Logging. LogLevel" /> is enabled.
7251 /// </summary>
7352 /// <param name="logLevel">The level to be checked.</param>
7453 /// <returns>Returns true if enabled.</returns>
75- public bool IsEnabled ( LogLevel logLevel )
76- {
77- return true ;
54+ public bool IsEnabled ( LogLevel logLevel ) {
55+ if ( logLevel == LogLevel . None || ! _client . Configuration . IsValid )
56+ return false ;
57+
58+ var minLogLevel = _client . Configuration . Settings . GetMinLogLevel ( _source ) ;
59+ return logLevel . ToLogLevel ( ) >= minLogLevel ;
7860 }
7961
62+ /// <inheritdoc />
8063 /// <summary>
8164 /// Writes a log entry.
8265 /// </summary>
@@ -85,84 +68,80 @@ public bool IsEnabled(LogLevel logLevel)
8568 /// <param name="eventId">Id of the event.</param>
8669 /// <param name="state">The entry to be written. Can be also an object.</param>
8770 /// <param name="exception">The exception related to this entry.</param>
88- /// <param name="formatter">Function to create a <see cref="string"/> message of the <paramref name="state"/> and <paramref name="exception"/>.</param>
89- public void Log < TState > ( LogLevel logLevel , EventId eventId , TState state , Exception exception , Func < TState , Exception , string > formatter )
90- {
91- // Create basic event from client
92- EventBuilder eb = exception == null ? _Client . CreateEvent ( ) : _Client . CreateException ( exception ) ;
93- eb . SetProperty ( Event . KnownDataKeys . Level , LOG_LEVELS [ logLevel ] ) ;
71+ /// <param name="formatter">Function to create a <see cref="T:System.String" /> message of the <paramref name="state" /> and <paramref name="exception" />.</param>
72+ public void Log < TState > ( LogLevel logLevel , EventId eventId , TState state , Exception exception , Func < TState , Exception , string > formatter ) {
73+ if ( formatter == null )
74+ throw new ArgumentNullException ( nameof ( formatter ) ) ;
9475
95- // Get formatted message
96- eb . SetMessage ( formatter . Invoke ( state , exception ) ) ;
76+ if ( ! IsEnabled ( logLevel ) )
77+ return ;
9778
98- // Add category as source, if available
99- if ( _Source != null )
100- eb . SetSource ( _Source ) ;
79+ string message = formatter ( state , exception ) ;
80+ if ( String . IsNullOrEmpty ( message ) && exception == null )
81+ return ;
82+
83+ var builder = exception == null ? _client . CreateLog ( _source , message , logLevel . ToLogLevel ( ) ) : _client . CreateException ( exception ) ;
84+ builder . Target . Date = DateTimeOffset . Now ;
85+
86+ if ( ! String . IsNullOrEmpty ( message ) )
87+ builder . SetMessage ( message ) ;
88+
89+ if ( exception != null )
90+ builder . SetSource ( _source ) ;
10191
10292 // Add event id, if available
10393 if ( eventId . Id != 0 )
104- eb . SetProperty ( "Event Id " , eventId . Id ) ;
94+ builder . SetProperty ( "EventId " , eventId . Id ) ;
10595
10696 // If within a scope, add scope's reference id
10797 if ( ExceptionlessLoggingScope . Current != null )
108- eb . SetEventReference ( "Parent" , ExceptionlessLoggingScope . Current . Id ) ;
98+ builder . SetEventReference ( "Parent" , ExceptionlessLoggingScope . Current . Id ) ;
10999
110100 // The logging framework passes in FormattedLogValues, which implements IEnumerable<KeyValuePair<string, object>>;
111101 // add each property and value as individual objects for proper visibility in Exceptionless
112- IEnumerable < KeyValuePair < string , object > > stateProps = state as IEnumerable < KeyValuePair < string , object > > ;
113- if ( stateProps != null )
114- {
115- foreach ( KeyValuePair < string , object > prop in stateProps )
116- {
102+ if ( state is IEnumerable < KeyValuePair < string , object > > stateProps ) {
103+ foreach ( KeyValuePair < string , object > prop in stateProps ) {
117104 // Logging the message template is superfluous
118105 if ( prop . Key != "{OriginalFormat}" )
119- eb . AddObject ( prop . Value , prop . Key ) ;
106+ builder . AddObject ( prop . Value , prop . Key ) ;
120107 }
121- }
122- // Otherwise, attach the entire object, using its type as the name
123- else
124- {
125- eb . AddObject ( state ) ;
108+ } else {
109+ // Otherwise, attach the entire object, using its type as the name
110+ builder . AddObject ( state ) ;
126111 }
127112
128- // Add to client's queue
129- eb . Submit ( ) ;
113+ builder . Submit ( ) ;
130114 }
131115
132116 /// <summary>
133117 /// Writes a scope creation entry.
134118 /// </summary>
135119 /// <param name="newScope">The <see cref="ExceptionlessLoggingScope"/> being created.</param>
136- private void LogScope ( ExceptionlessLoggingScope newScope , object state )
137- {
138- EventBuilder eb = _Client . CreateLog ( $ "Creating scope: { newScope . Description } .", global :: Exceptionless . Logging . LogLevel . Other ) ;
120+ /// <param name=" state"></param>
121+ private void LogScope ( ExceptionlessLoggingScope newScope , object state ) {
122+ var builder = _client . CreateLog ( $ "Creating scope: { newScope . Description } .", ExceptionlessLogLevel . Other ) ;
139123
140124 // Set event reference id to that of scope object
141- eb . SetReferenceId ( newScope . Id ) ;
125+ builder . SetReferenceId ( newScope . Id ) ;
142126
143127 // If this is a nested scope, add parent's reference id
144128 if ( ExceptionlessLoggingScope . Current != null )
145- eb . SetEventReference ( "Parent" , ExceptionlessLoggingScope . Current . Id ) ;
129+ builder . SetEventReference ( "Parent" , ExceptionlessLoggingScope . Current . Id ) ;
146130
147- if ( state != null )
148- {
131+ if ( state != null ) {
149132 IEnumerable < KeyValuePair < string , object > > stateProps = state as IEnumerable < KeyValuePair < string , object > > ;
150- if ( stateProps != null )
151- {
152- foreach ( KeyValuePair < string , object > prop in stateProps )
153- {
133+ if ( stateProps != null ) {
134+ foreach ( KeyValuePair < string , object > prop in stateProps ) {
154135 // Logging the message template is superfluous
155136 if ( prop . Key != "{OriginalFormat}" )
156- eb . AddObject ( prop . Value , prop . Key ) ;
137+ builder . AddObject ( prop . Value , prop . Key ) ;
157138 }
158- }
159- else
160- {
161- eb . AddObject ( state ) ;
139+ } else {
140+ builder . AddObject ( state ) ;
162141 }
163142 }
164143
165- eb . Submit ( ) ;
144+ builder . Submit ( ) ;
166145 }
167146 }
168- }
147+ }
0 commit comments