You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2008/10/10 20:09:42 UTC
svn commit: r703541 - in
/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log:
JdkLogChute.java Log4JLogChute.java
Author: nbubna
Date: Fri Oct 10 11:09:42 2008
New Revision: 703541
URL: http://svn.apache.org/viewvc?rev=703541&view=rev
Log:
VELOCITY-624 don't override pre-configured log levels for JdkLogChute or Log4JLogChute (thx to Byron Foster)
Modified:
velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/JdkLogChute.java
velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogChute.java
Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/JdkLogChute.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/JdkLogChute.java?rev=703541&r1=703540&r2=703541&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/JdkLogChute.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/JdkLogChute.java Fri Oct 10 11:09:42 2008
@@ -60,12 +60,16 @@
}
logger = Logger.getLogger(name);
- /* get and set specified level for this logger, default to WARN */
- String lvl = rs.getString(RUNTIME_LOG_JDK_LOGGER_LEVEL, "WARNING");
- Level level = Level.parse(lvl);
- logger.setLevel(level);
+ /* get and set specified level for this logger, */
+ String lvl = rs.getString(RUNTIME_LOG_JDK_LOGGER_LEVEL);
+ if (lvl != null)
+ {
+ Level level = Level.parse(lvl);
+ logger.setLevel(level);
+ log(LogChute.DEBUG_ID, "JdkLogChute will use logger '"
+ +name+'\''+" at level '"+level+'\'');
+ }
- log(LogChute.DEBUG_ID, "JdkLogChute will use logger '"+name+'\''+" at level '"+level+'\'');
}
/**
Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogChute.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogChute.java?rev=703541&r1=703540&r2=703541&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogChute.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogChute.java Fri Oct 10 11:09:42 2008
@@ -86,11 +86,14 @@
}
}
- /* get and set specified level for this logger, default to WARN */
- String lvl = rsvc.getString(RUNTIME_LOG_LOG4J_LOGGER_LEVEL, "WARN");
- Level level = Level.toLevel(lvl);
- logger.setLevel(level);
-
+ /* get and set specified level for this logger */
+ String lvl = rsvc.getString(RUNTIME_LOG_LOG4J_LOGGER_LEVEL);
+ if (lvl != null)
+ {
+ Level level = Level.toLevel(lvl);
+ logger.setLevel(level);
+ }
+
/* Ok, now let's see if this version of log4j supports the trace level. */
try
{