Return-Path: Delivered-To: apmail-jakarta-velocity-dev-archive@jakarta.apache.org Received: (qmail 44207 invoked by uid 500); 19 Mar 2001 05:15:53 -0000 Mailing-List: contact velocity-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: velocity-dev@jakarta.apache.org Delivered-To: mailing list velocity-dev@jakarta.apache.org Received: (qmail 44198 invoked by uid 500); 19 Mar 2001 05:15:53 -0000 Delivered-To: apmail-jakarta-velocity-cvs@apache.org Date: 19 Mar 2001 05:15:52 -0000 Message-ID: <20010319051552.44194.qmail@apache.org> From: geirm@apache.org To: jakarta-velocity-cvs@apache.org Subject: cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime Runtime.java geirm 01/03/18 21:15:52 Modified: src/java/org/apache/velocity/runtime Runtime.java Log: Moved logger creation to the LogManager Revision Changes Path 1.97 +54 -17 jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java Index: Runtime.java =================================================================== RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- Runtime.java 2001/03/17 19:19:52 1.96 +++ Runtime.java 2001/03/19 05:15:51 1.97 @@ -139,7 +139,7 @@ * @author Jason van Zyl * @author Jeff Bowden * @author Geir Magusson Jr. - * @version $Id: Runtime.java,v 1.96 2001/03/17 19:19:52 jvanzyl Exp $ + * @version $Id: Runtime.java,v 1.97 2001/03/19 05:15:51 geirm Exp $ */ public class Runtime implements RuntimeConstants { @@ -328,7 +328,7 @@ */ public static Object getProperty( String key ) { - return configuration.get( key ); + return configuration.getProperty( key ); } /** @@ -387,26 +387,20 @@ * @throws Exception */ private static void initializeLogger() throws Exception - { - /* - * Grab the log file entry from the velocity - * properties file. - */ - String logFile = configuration.getString(RUNTIME_LOG); - + { /* * Initialize the logger. We will eventually move all * logging into the logging manager. */ if (logSystem == null) - logSystem = LogManager.createLogSystem(logFile); + { + logSystem = LogManager.createLogSystem(); + } /* * Dump the pending messages */ dumpPendingMessages(); - - Runtime.info("Log file being used is: " + new File(logFile).getAbsolutePath()); } /* @@ -626,18 +620,61 @@ * * @param String message to log */ - private static void log(int type, Object message) + private static void log(int level, Object message) { + String out = ""; + + /* + * Start with the appropriate prefix + */ + + switch( level ) { + case LogSystem.DEBUG_ID : + out = DEBUG_PREFIX; + break; + case LogSystem.INFO_ID : + out = WARN_PREFIX; + break; + case LogSystem.WARN_ID : + out = WARN_PREFIX; + break; + case LogSystem.ERROR_ID : + out = ERROR_PREFIX; + break; + default : + out = "[unknown]"; + break; + } + + /* + * now, see if the logging stacktrace is on + * and modify the message to suit + */ + + if ( showStackTrace() && + (message instanceof Throwable || message instanceof Exception) ) + { + out += StringUtils.stackTrace((Throwable)message); + } + else + { + out += message.toString(); + } + + /* + * now, if we have a log system, log it + * otherwise, queue it up for later + */ + if (logSystem != null) { - logSystem.setStackTrace(showStackTrace()); - logSystem.log(type, message); + logSystem.logVelocityMessage( level, out); } else { Object[] data = new Object[2]; - data[0] = new Integer(type); - data[1] = message; + data[0] = new Integer(level); + data[1] = out; pendingMessages.addElement(data); } }