Refactor setting default log level

sfc-gh-ext-simba-lf · sfc-gh-ext-simba-lf · commit 9849892a3954 · 2025-05-21T10:56:45.000-07:00
diff --git a/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerPairTest.cs b/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerPairTest.cs
@@ -47,6 +47,10 @@ public void TestIsDebugEnabled(
             {
                 SFLoggerImpl.SetLevel(LoggingEvent.DEBUG);
             }
+            else
+            {
+                SFLoggerImpl.SetLevel(LoggingEvent.OFF);
+            }
 
             Assert.AreEqual(isEnabled, _loggerPair.IsDebugEnabled());
             _loggerPair.Debug("debug log message", new Exception("test exception"));
@@ -61,6 +65,10 @@ public void TestIsInfoEnabled(
             {
                 SFLoggerImpl.SetLevel(LoggingEvent.INFO);
             }
+            else
+            {
+                SFLoggerImpl.SetLevel(LoggingEvent.OFF);
+            }
 
             Assert.AreEqual(isEnabled, _loggerPair.IsInfoEnabled());
             _loggerPair.Info("info log message", new Exception("test exception"));
@@ -75,6 +83,10 @@ public void TestIsWarnEnabled(
             {
                 SFLoggerImpl.SetLevel(LoggingEvent.WARN);
             }
+            else
+            {
+                SFLoggerImpl.SetLevel(LoggingEvent.OFF);
+            }
 
             Assert.AreEqual(isEnabled, _loggerPair.IsWarnEnabled());
             _loggerPair.Warn("warn log message", new Exception("test exception"));
@@ -89,6 +101,10 @@ public void TestIsErrorEnabled(
             {
                 SFLoggerImpl.SetLevel(LoggingEvent.ERROR);
             }
+            else
+            {
+                SFLoggerImpl.SetLevel(LoggingEvent.OFF);
+            }
 
             Assert.AreEqual(isEnabled, _loggerPair.IsErrorEnabled());
             _loggerPair.Error("error log message", new Exception("test exception"));
diff --git a/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerTest.cs b/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerTest.cs
@@ -40,6 +40,10 @@ public void TestIsDebugEnabled(
             {
                 SFLoggerImpl.SetLevel(LoggingEvent.DEBUG);
             }
+            else
+            {
+                SFLoggerImpl.SetLevel(LoggingEvent.OFF);
+            }
 
             Assert.AreEqual(isEnabled, _logger.IsDebugEnabled());
             _logger.Debug("debug log message", new Exception("test exception"));
@@ -54,6 +58,10 @@ public void TestIsInfoEnabled(
             {
                 SFLoggerImpl.SetLevel(LoggingEvent.INFO);
             }
+            else
+            {
+                SFLoggerImpl.SetLevel(LoggingEvent.OFF);
+            }
 
             Assert.AreEqual(isEnabled, _logger.IsInfoEnabled());
             _logger.Info("info log message", new Exception("test exception"));
@@ -68,6 +76,10 @@ public void TestIsWarnEnabled(
             {
                 SFLoggerImpl.SetLevel(LoggingEvent.WARN);
             }
+            else
+            {
+                SFLoggerImpl.SetLevel(LoggingEvent.OFF);
+            }
 
             Assert.AreEqual(isEnabled, _logger.IsWarnEnabled());
             _logger.Warn("warn log message", new Exception("test exception"));
@@ -82,6 +94,10 @@ public void TestIsErrorEnabled(
             {
                 SFLoggerImpl.SetLevel(LoggingEvent.ERROR);
             }
+            else
+            {
+                SFLoggerImpl.SetLevel(LoggingEvent.OFF);
+            }
 
             Assert.AreEqual(isEnabled, _logger.IsErrorEnabled());
             _logger.Error("error log message", new Exception("test exception"));
diff --git a/Snowflake.Data/Core/Session/EasyLoggingStarter.cs b/Snowflake.Data/Core/Session/EasyLoggingStarter.cs
@@ -69,6 +69,7 @@ public virtual void Init(string configFilePathFromConnectionString)
                     _initTrialParameters = new EasyLoggingInitTrialParameters(configFilePathFromConnectionString);
                     return;
                 }
+                SFLoggerImpl.SetLevel(LoggingEvent.OFF); // Logger is disabled by default and can be enabled by the EasyLogging feature
                 var logLevel = GetLogLevel(config.CommonProps.LogLevel);
                 var logPath = GetLogPath(config.CommonProps.LogPath);
                 s_logger.Info($"LogLevel set to {logLevel}");
diff --git a/Snowflake.Data/Logger/SFLoggerFactory.cs b/Snowflake.Data/Logger/SFLoggerFactory.cs
@@ -4,8 +4,6 @@ namespace Snowflake.Data.Log
 {
     internal class SFLoggerFactory
     {
-        internal static bool s_isSFLoggerEnabled = false;
-
         internal static ILogger s_customLogger = new LoggerEmptyImpl();
 
         internal static SFLogger GetLogger<T>()
@@ -16,10 +14,6 @@ internal static SFLogger GetLogger<T>()
         internal static SFLogger GetSFLogger<T>()
         {
             var logger = new SFLoggerImpl(typeof(T));
-            if (!s_isSFLoggerEnabled)
-            {
-                SFLoggerImpl.SetLevel(LoggingEvent.OFF); // Logger is disabled by default and can be enabled by the EasyLogging feature
-            }
             return logger;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,10 @@ public void TestIsDebugEnabled(`
`47`	`47`	`{`
`48`	`48`	`SFLoggerImpl.SetLevel(LoggingEvent.DEBUG);`
`49`	`49`	`}`
	`50`	`+ else`
	`51`	`+ {`
	`52`	`+ SFLoggerImpl.SetLevel(LoggingEvent.OFF);`
	`53`	`+ }`
`50`	`54`
`51`	`55`	`Assert.AreEqual(isEnabled, _loggerPair.IsDebugEnabled());`
`52`	`56`	`_loggerPair.Debug("debug log message", new Exception("test exception"));`
`@@ -61,6 +65,10 @@ public void TestIsInfoEnabled(`
`61`	`65`	`{`
`62`	`66`	`SFLoggerImpl.SetLevel(LoggingEvent.INFO);`
`63`	`67`	`}`
	`68`	`+ else`
	`69`	`+ {`
	`70`	`+ SFLoggerImpl.SetLevel(LoggingEvent.OFF);`
	`71`	`+ }`
`64`	`72`
`65`	`73`	`Assert.AreEqual(isEnabled, _loggerPair.IsInfoEnabled());`
`66`	`74`	`_loggerPair.Info("info log message", new Exception("test exception"));`
`@@ -75,6 +83,10 @@ public void TestIsWarnEnabled(`
`75`	`83`	`{`
`76`	`84`	`SFLoggerImpl.SetLevel(LoggingEvent.WARN);`
`77`	`85`	`}`
	`86`	`+ else`
	`87`	`+ {`
	`88`	`+ SFLoggerImpl.SetLevel(LoggingEvent.OFF);`
	`89`	`+ }`
`78`	`90`
`79`	`91`	`Assert.AreEqual(isEnabled, _loggerPair.IsWarnEnabled());`
`80`	`92`	`_loggerPair.Warn("warn log message", new Exception("test exception"));`
`@@ -89,6 +101,10 @@ public void TestIsErrorEnabled(`
`89`	`101`	`{`
`90`	`102`	`SFLoggerImpl.SetLevel(LoggingEvent.ERROR);`
`91`	`103`	`}`
	`104`	`+ else`
	`105`	`+ {`
	`106`	`+ SFLoggerImpl.SetLevel(LoggingEvent.OFF);`
	`107`	`+ }`
`92`	`108`
`93`	`109`	`Assert.AreEqual(isEnabled, _loggerPair.IsErrorEnabled());`
`94`	`110`	`_loggerPair.Error("error log message", new Exception("test exception"));`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ public void TestIsDebugEnabled(`
`40`	`40`	`{`
`41`	`41`	`SFLoggerImpl.SetLevel(LoggingEvent.DEBUG);`
`42`	`42`	`}`
	`43`	`+ else`
	`44`	`+ {`
	`45`	`+ SFLoggerImpl.SetLevel(LoggingEvent.OFF);`
	`46`	`+ }`
`43`	`47`
`44`	`48`	`Assert.AreEqual(isEnabled, _logger.IsDebugEnabled());`
`45`	`49`	`_logger.Debug("debug log message", new Exception("test exception"));`
`@@ -54,6 +58,10 @@ public void TestIsInfoEnabled(`
`54`	`58`	`{`
`55`	`59`	`SFLoggerImpl.SetLevel(LoggingEvent.INFO);`
`56`	`60`	`}`
	`61`	`+ else`
	`62`	`+ {`
	`63`	`+ SFLoggerImpl.SetLevel(LoggingEvent.OFF);`
	`64`	`+ }`
`57`	`65`
`58`	`66`	`Assert.AreEqual(isEnabled, _logger.IsInfoEnabled());`
`59`	`67`	`_logger.Info("info log message", new Exception("test exception"));`
`@@ -68,6 +76,10 @@ public void TestIsWarnEnabled(`
`68`	`76`	`{`
`69`	`77`	`SFLoggerImpl.SetLevel(LoggingEvent.WARN);`
`70`	`78`	`}`
	`79`	`+ else`
	`80`	`+ {`
	`81`	`+ SFLoggerImpl.SetLevel(LoggingEvent.OFF);`
	`82`	`+ }`
`71`	`83`
`72`	`84`	`Assert.AreEqual(isEnabled, _logger.IsWarnEnabled());`
`73`	`85`	`_logger.Warn("warn log message", new Exception("test exception"));`
`@@ -82,6 +94,10 @@ public void TestIsErrorEnabled(`
`82`	`94`	`{`
`83`	`95`	`SFLoggerImpl.SetLevel(LoggingEvent.ERROR);`
`84`	`96`	`}`
	`97`	`+ else`
	`98`	`+ {`
	`99`	`+ SFLoggerImpl.SetLevel(LoggingEvent.OFF);`
	`100`	`+ }`
`85`	`101`
`86`	`102`	`Assert.AreEqual(isEnabled, _logger.IsErrorEnabled());`
`87`	`103`	`_logger.Error("error log message", new Exception("test exception"));`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ public virtual void Init(string configFilePathFromConnectionString)`
`69`	`69`	`_initTrialParameters = new EasyLoggingInitTrialParameters(configFilePathFromConnectionString);`
`70`	`70`	`return;`
`71`	`71`	`}`
	`72`	`+ SFLoggerImpl.SetLevel(LoggingEvent.OFF); // Logger is disabled by default and can be enabled by the EasyLogging feature`
`72`	`73`	`var logLevel = GetLogLevel(config.CommonProps.LogLevel);`
`73`	`74`	`var logPath = GetLogPath(config.CommonProps.LogPath);`
`74`	`75`	`s_logger.Info($"LogLevel set to {logLevel}");`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@ namespace Snowflake.Data.Log`
`4`	`4`	`{`
`5`	`5`	`internal class SFLoggerFactory`
`6`	`6`	`{`
`7`		`- internal static bool s_isSFLoggerEnabled = false;`
`8`		`-`
`9`	`7`	`internal static ILogger s_customLogger = new LoggerEmptyImpl();`
`10`	`8`
`11`	`9`	`internal static SFLogger GetLogger<T>()`
`@@ -16,10 +14,6 @@ internal static SFLogger GetLogger<T>()`
`16`	`14`	`internal static SFLogger GetSFLogger<T>()`
`17`	`15`	`{`
`18`	`16`	`var logger = new SFLoggerImpl(typeof(T));`
`19`		`- if (!s_isSFLoggerEnabled)`
`20`		`- {`
`21`		`- SFLoggerImpl.SetLevel(LoggingEvent.OFF); // Logger is disabled by default and can be enabled by the EasyLogging feature`
`22`		`- }`
`23`	`17`	`return logger;`
`24`	`18`	`}`
`25`	`19`	`}`