@@ -64,17 +64,12 @@ public static void ConfigureLogging(LoggingSettings loggingSettings)
6464 nlogConfig . LoggingRules . Add ( aspNetCoreRule ) ;
6565 nlogConfig . LoggingRules . Add ( httpClientRule ) ;
6666
67- // HACK: Fixed LogLevel to Info for testing purposes only.
68- // Migrate to .NET logging and change back to loggingSettings.LogLevel.
69- // nlogConfig.LoggingRules.Add(new LoggingRule("*", loggingSettings.LogLevel, consoleTarget));
70- nlogConfig . LoggingRules . Add ( new LoggingRule ( "*" , LogLevel . Info , consoleTarget ) ) ;
67+ var logLevel = loggingSettings . LogLevel . ToNLogLevel ( ) ;
68+ nlogConfig . LoggingRules . Add ( new LoggingRule ( "*" , logLevel , consoleTarget ) ) ;
7169
7270 if ( ! AppEnvironment . RunningInContainer )
7371 {
74- // HACK: Fixed LogLevel to Info for testing purposes only.
75- // Migrate to .NET logging and change back to loggingSettings.LogLevel.
76- // nlogConfig.LoggingRules.Add(new LoggingRule("*", loggingSettings.LogLevel, fileTarget));
77- nlogConfig . LoggingRules . Add ( new LoggingRule ( "*" , LogLevel . Info , fileTarget ) ) ;
72+ nlogConfig . LoggingRules . Add ( new LoggingRule ( "*" , logLevel , fileTarget ) ) ;
7873 }
7974
8075 NLog . LogManager . Configuration = nlogConfig ;
@@ -83,9 +78,25 @@ public static void ConfigureLogging(LoggingSettings loggingSettings)
8378 var logger = LogManager . GetLogger ( "LoggingConfiguration" ) ;
8479 var logEventInfo = new LogEventInfo { TimeStamp = DateTime . UtcNow } ;
8580 var loggingTo = AppEnvironment . RunningInContainer ? "console" : fileTarget . FileName . Render ( logEventInfo ) ;
86- logger . InfoFormat ( "Logging to {0} with LogLevel '{1}'" , loggingTo , LogLevel . Info . Name ) ;
81+ logger . InfoFormat ( "Logging to {0} with LogLevel '{1}'" , loggingTo , logLevel . Name ) ;
82+ }
83+
84+ static LogLevel ToNLogLevel ( this Microsoft . Extensions . Logging . LogLevel level )
85+ {
86+ return level switch
87+ {
88+ Microsoft . Extensions . Logging . LogLevel . Trace => LogLevel . Trace ,
89+ Microsoft . Extensions . Logging . LogLevel . Debug => LogLevel . Debug ,
90+ Microsoft . Extensions . Logging . LogLevel . Information => LogLevel . Info ,
91+ Microsoft . Extensions . Logging . LogLevel . Warning => LogLevel . Warn ,
92+ Microsoft . Extensions . Logging . LogLevel . Error => LogLevel . Error ,
93+ Microsoft . Extensions . Logging . LogLevel . Critical => LogLevel . Fatal ,
94+ Microsoft . Extensions . Logging . LogLevel . None => LogLevel . Off ,
95+ _ => LogLevel . Off ,
96+ } ;
8797 }
8898
8999 const long megaByte = 1024 * 1024 ;
100+
90101 }
91102}
0 commit comments