Merge pull request #17964 from iterate-ch/bugfix/log4j-root-logger

Do not set hard coded log level to ERROR but honor root logger level …

Author: ylangisc

core/src/main/java/ch/cyberduck/core/preferences/Preferences.java

@@ -327,10 +327,18 @@ public void setLogging(final String level) {
         this.configureLogging(level);
     }
 
+    /**
+     * Reset logging configuration to default level from configuration
+     */
+    public void resetLogging() {
+        this.deleteProperty("logging");
+        this.configureLogging(null);
+    }
+
     /**
      * Reconfigure logging configuration
      *
-     * @param level Log level
+     * @param level Log level or null to use default level from configuration
      */
     protected void configureLogging(final String level) {
         // Call only once during initialization time of your application
@@ -346,10 +354,13 @@ protected void configureLogging(final String level) {
             }
             catch(IOException e) {
                 log.error("Failure configuring log4j", e);
+                Configurator.setRootLevel(Level.ERROR);
             }
         }
-        // Allow to override default logging level
-        Configurator.setRootLevel(Level.toLevel(level, Level.ERROR));
+        if(StringUtils.isNotEmpty(level)) {
+            // Allow to override default logging level
+            Configurator.setRootLevel(Level.toLevel(level, Level.ERROR));
+        }
         // Map logging level to pass through bridge
         final ImmutableMap<Level, java.util.logging.Level> map = new ImmutableMap.Builder<Level, java.util.logging.Level>()
                 .put(Level.ALL, java.util.logging.Level.ALL)
@@ -369,7 +380,7 @@ protected void configureLogging(final String level) {
                 java.util.logging.Logger.getLogger(loggerConfig.getName()).setLevel(map.get(loggerConfig.getLevel()));
             }
         }
-        this.configureAppenders(level);
+        this.configureAppenders(LogManager.getRootLogger().getLevel().name());
     }
 
     private InputStream getLogConfiguration() {

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/PreferencesController.java

@@ -2470,7 +2470,7 @@ public void logCheckboxClicked(final NSButton sender) {
                 preferences.setLogging(Level.DEBUG.toString());
                 break;
             default:
-                preferences.setLogging(Level.ERROR.toString());
+                preferences.resetLogging();
                 break;
         }
     }

windows/src/main/csharp/ch/cyberduck/ui/controller/PreferencesController.cs

@@ -193,7 +193,14 @@ private void View_ShowDebugLogEvent()
 
         private void View_DebugLogChangedEvent()
         {
-            PreferencesFactory.get().setLogging(View.DebugLog ? Level.DEBUG.toString() : Level.ERROR.toString());
+            if (View.DebugLog)
+            {
+                PreferencesFactory.get().setLogging(Level.DEBUG.name());
+            }
+            else
+            {
+                PreferencesFactory.get().resetLogging();
+            }
         }
 
         private void View_SegmentedDownloadsChangedEvent()