Disable SF logger by default

snowflakedb · Jan 15, 2025 · 588c1ee · 588c1ee
1 parent 294f992
commit 588c1ee
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerPairTest.cs b/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerPairTest.cs
@@ -38,13 +38,13 @@ public void BeforeTest()
         public void AfterTest()
         {
             // Return to default setting
-            SFLoggerFactory.EnableSFLogger();
+            SFLoggerFactory.UseDefaultSFLogger();
         }
 
         [Test]
         public void TestUsingSFLogger()
         {
-            SFLoggerFactory.EnableSFLogger();
+            SFLoggerFactory.UseDefaultSFLogger();
             _loggerPair = SFLoggerFactory.GetLogger<SFLoggerPairTest>();
             Assert.IsInstanceOf<SFLoggerPair>(_loggerPair);
         }
@@ -127,11 +127,11 @@ private SFLogger GetLogger(bool isEnabled)
         {
             if (isEnabled)
             {
-                SFLoggerFactory.EnableSFLogger();
+                SFLoggerFactory.UseDefaultSFLogger();
             }
             else
             {
-                SFLoggerFactory.DisableSFLogger();
+                SFLoggerFactory.UseEmptySFLogger();
             }
 
             return SFLoggerFactory.GetLogger<SFLoggerPairTest>();

diff --git a/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerTest.cs b/Snowflake.Data.Tests/UnitTests/Logger/SFLoggerTest.cs
@@ -32,21 +32,21 @@ public static void AfterAll()
         public void AfterTest()
         {
             // Return to default setting
-            SFLoggerFactory.EnableSFLogger();
+            SFLoggerFactory.UseDefaultSFLogger();
         }
 
         [Test]
         public void TestUsingSFLogger()
         {
-            SFLoggerFactory.EnableSFLogger();
+            SFLoggerFactory.UseDefaultSFLogger();
             _logger = SFLoggerFactory.GetSFLogger<SFLoggerTest>();
             Assert.IsInstanceOf<SFLoggerImpl>(_logger);
         }
 
         [Test]
         public void TestUsingEmptyLogger()
         {
-            SFLoggerFactory.DisableSFLogger();
+            SFLoggerFactory.UseEmptySFLogger();
             _logger = SFLoggerFactory.GetSFLogger<SFLoggerTest>();
             Assert.IsInstanceOf<SFLoggerEmptyImpl>(_logger);
         }
@@ -173,11 +173,11 @@ private SFLogger GetLogger(bool isEnabled)
         {
             if (isEnabled)
             {
-                SFLoggerFactory.EnableSFLogger();
+                SFLoggerFactory.UseDefaultSFLogger();
             }
             else
             {
-                SFLoggerFactory.DisableSFLogger();
+                SFLoggerFactory.UseEmptySFLogger();
             }
 
             return SFLoggerFactory.GetSFLogger<SFLoggerTest>(false);

diff --git a/Snowflake.Data/Logger/SFLoggerFactory.cs b/Snowflake.Data/Logger/SFLoggerFactory.cs
@@ -11,18 +11,20 @@ public class SFLoggerFactory
     {
         private static bool s_isCustomLoggerEnabled = false;
 
-        private static bool s_isSFLoggerEnabled = true;
+        private static bool s_isSFLoggerEnabled = false;
+
+        private static bool s_useDefaultSFLogger = true;
 
         private static ILogger s_customLogger = null;
 
-        public static void DisableSFLogger()
+        public static void UseEmptySFLogger()
         {
-            s_isSFLoggerEnabled = false;
+            s_useDefaultSFLogger = false;
         }
 
-        public static void EnableSFLogger()
+        public static void UseDefaultSFLogger()
         {
-            s_isSFLoggerEnabled = true;
+            s_useDefaultSFLogger = true;
         }
 
         public static void DisableCustomLogger()
@@ -53,9 +55,13 @@ internal static SFLogger GetLogger<T>()
         internal static SFLogger GetSFLogger<T>(bool useFileAppender = true)
         {
             // If true, return the default/specified logger
-            if (s_isSFLoggerEnabled)
+            if (s_useDefaultSFLogger)
             {
                 var logger = new SFLoggerImpl(typeof(T));
+                if (!s_isSFLoggerEnabled)
+                {
+                    logger.SetLevel(LoggingEvent.OFF); // Logger is disabled by default and can be enabled by the EasyLogging feature
+                }
                 if (useFileAppender)
                 {
                     var fileAppender = new SFRollingFileAppender()