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
This commit is contained in:
hns 2009-11-25 10:55:51 +00:00
parent 16ead75851
commit 36c1557c99

View file

@ -1539,13 +1539,7 @@ public final class Application implements Runnable {
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 @@ public final class Application implements Runnable {
}
}
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 @@ public final class Application implements Runnable {
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();