r9995 - helma/helma/trunk/src/helma/framework/core

Author: hannes
Date: 2009-11-25 11:55:51 +0100 (Wed, 25 Nov 2009)
New Revision: 9995

Modified:
   helma/helma/trunk/src/helma/framework/core/Application.java
Log:
Make sure event-log logging level is set according to debug property.
Fixes bug 696 http://dev.helma.org/bugs/show_bug.cgi?id=696

Details at http://dev.helma.org/trac/helma/changeset/9995

Modified: helma/helma/trunk/src/helma/framework/core/Application.java
===================================================================
--- helma/helma/trunk/src/helma/framework/core/Application.java	2009-11-25 09:33:28 UTC (rev 9994)
+++ helma/helma/trunk/src/helma/framework/core/Application.java	2009-11-25 10:55:51 UTC (rev 9995)
@@ -1539,13 +1539,7 @@
     public Log getEventLog() {
         if (eventLog == null) {
             eventLog = getLogger(eventLogName);
-            // set log level for event log in case it is a helma.util.Logger
-            if (eventLog instanceof Logger) {
-                if (debug && !eventLog.isDebugEnabled())
-                    ((Logger) eventLog).setLogLevel(Logger.DEBUG);
-                else if (!eventLog.isInfoEnabled())
-                    ((Logger) eventLog).setLogLevel(Logger.INFO);
-            }
+            setEventLogLevel();
         }
         return eventLog;
     }
@@ -1571,6 +1565,19 @@
         }
     }
 
+    private void setEventLogLevel() {
+        // set log level for event log in case it is a helma.util.Logger
+        if (eventLog instanceof Logger) {
+            if (debug) {
+                if (!eventLog.isDebugEnabled()) {
+                    ((Logger) eventLog).setLogLevel(Logger.DEBUG);
+                }
+            } else if (eventLog.isDebugEnabled()) {
+                ((Logger) eventLog).setLogLevel(Logger.INFO);
+            }
+        }
+    }
+
     /**
      * The run method performs periodic tasks like executing the scheduler method and
      * kicking out expired user sessions.
@@ -1958,13 +1965,8 @@
                 logDir = null;
             }
 
-            // set log level for event log in case it is a helma.util.Logger
-            if (eventLog instanceof Logger) {
-                if (debug && !eventLog.isDebugEnabled())
-                    ((Logger) eventLog).setLogLevel(Logger.DEBUG);
-                else if (!eventLog.isInfoEnabled())
-                    ((Logger) eventLog).setLogLevel(Logger.INFO);
-            }
+            // set log level for event log in case debug flag has changed
+            setEventLogLevel();
 
             // set prop read timestamp
             lastPropertyRead = props.lastModified();