- slf4j-dev - mailman3.qos.ch

[GIT] SLF4J: Simple Logging Facade for Java branch master updated. v_1.7.0-9-ge8b0826
by git-noreply＠pixie.qos.ch 14 Sep '12

14 Sep '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via e8b082611b42cb319136fb95bac45a32e7f72b1c (commit) from 37579087aa061cf2861f2aee6fc35a8f17017708 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=e8b082611b42cb319136fb95ba… http://github.com/ceki/slf4j/commit/e8b082611b42cb319136fb95bac45a32e7f72b1c commit e8b082611b42cb319136fb95bac45a32e7f72b1c Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Sep 14 21:19:17 2012 +0200 delay initialization until first logger is invoked diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java index c5540f3..87f525c 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java @@ -48,13 +48,14 @@ import org.slf4j.spi.LocationAwareLogger; * The following system properties are supported to configure the behavior of this logger: * <ul> * <li><code>org.slf4j.simpleLogger.defaultLog</code> - - * Default logging detail level for all instances of SimpleLogger. + * Default logging level for all instances of SimpleLogger. * Must be one of ("trace", "debug", "info", "warn", or "error"). * If not specified, defaults to "info". </li> * <li><code>org.slf4j.simpleLogger.log.xxxxx</code> - * Logging detail level for a SimpleLogger instance named "xxxxx". * Must be one of ("trace", "debug", "info", "warn", or "error"). - * If not specified, the default logging detail level is used.</li> + * If not specified, the level of parent logger will be used, and if none is set, then + * the default level is used.</li> * <li><code>org.slf4j.simpleLogger.showDateTime</code> - * Set to <code>true</code> if you want the current date and time * to be included in output messages. Default is <code>true</code></li> @@ -112,21 +113,30 @@ public class SimpleLogger extends MarkerIgnoringBase { private static long START_TIME = System.currentTimeMillis(); private static final Properties SIMPLE_LOGGER_PROPS = new Properties(); - private static boolean SHOW_LOG_NAME = true; + + private static final int LOG_LEVEL_TRACE = LocationAwareLogger.TRACE_INT; + private static final int LOG_LEVEL_DEBUG = LocationAwareLogger.DEBUG_INT; + private static final int LOG_LEVEL_INFO = LocationAwareLogger.INFO_INT; + private static final int LOG_LEVEL_WARN = LocationAwareLogger.WARN_INT; + private static final int LOG_LEVEL_ERROR = LocationAwareLogger.ERROR_INT; + + private static int DEFAULT_LOG_LEVEL = LOG_LEVEL_INFO; + + private static boolean SHOW_SHORT_LOG_NAME = false; private static boolean SHOW_DATE_TIME = false; + private static String DATE_TIME_FORMAT_STR = null; private static boolean SHOW_THREAD_NAME = true; + private static boolean SHOW_LOG_NAME = true; + + private static String LOG_FILE = "System.err"; private static boolean LEVEL_IN_BRACKETS = false; private static DateFormat DATE_FORMATTER = null; - private static final int LOG_LEVEL_TRACE = LocationAwareLogger.TRACE_INT; - private static final int LOG_LEVEL_DEBUG = LocationAwareLogger.DEBUG_INT; - private static final int LOG_LEVEL_INFO = LocationAwareLogger.INFO_INT; - private static final int LOG_LEVEL_WARN = LocationAwareLogger.WARN_INT; - private static final int LOG_LEVEL_ERROR = LocationAwareLogger.ERROR_INT; + private static boolean INITIALIZED = false; /** * All system properties used by <code>SimpleLogger</code> start with this prefix @@ -140,13 +150,12 @@ public class SimpleLogger extends MarkerIgnoringBase { public static final String DATE_TIME_FORMAT_KEY = SYSTEM_PREFIX + "dateTimeFormat"; public static final String SHOW_DATE_TIME_KEY = SYSTEM_PREFIX + "showDateTime"; public static final String LOG_FILE_KEY = SYSTEM_PREFIX + "logFile"; - public static final String LEVEL_IN_BRACKETS_KEY = SYSTEM_PREFIX + "levelInBrackets"; + public static final String LOG_KEY_PREFIX = SYSTEM_PREFIX + "log."; - private static int DEFAULT_LOG_LEVEL = LOG_LEVEL_INFO; private static PrintStream TARGET_STREAM = null; private static String getStringProperty(String name) { @@ -173,10 +182,10 @@ public class SimpleLogger extends MarkerIgnoringBase { // Initialize class attributes. // Load properties file, if found. // Override with system properties. - static { + static void init() { + INITIALIZED = true; loadProperties(); - String defaultLogLevelString = getStringProperty(DEFAULT_LOG_KEY, null); if (defaultLogLevelString != null) DEFAULT_LOG_LEVEL = stringToLevel(defaultLogLevelString); @@ -188,7 +197,6 @@ public class SimpleLogger extends MarkerIgnoringBase { DATE_TIME_FORMAT_STR = getStringProperty(DATE_TIME_FORMAT_KEY, DATE_TIME_FORMAT_STR); LEVEL_IN_BRACKETS = getBooleanProperty(LEVEL_IN_BRACKETS_KEY, LEVEL_IN_BRACKETS); - LOG_FILE = getStringProperty(LOG_FILE_KEY, LOG_FILE); TARGET_STREAM = computeTargetStream(LOG_FILE); @@ -201,6 +209,8 @@ public class SimpleLogger extends MarkerIgnoringBase { } } + + private static PrintStream computeTargetStream(String logFile) { if ("System.err".equalsIgnoreCase(logFile)) return System.err; @@ -258,6 +268,9 @@ public class SimpleLogger extends MarkerIgnoringBase { * SimpleLogger instances. */ SimpleLogger(String name) { + if(!INITIALIZED) { + init(); + } this.name = name; String levelString = recursivelyComputeLevelString(); ----------------------------------------------------------------------- Summary of changes: .../src/main/java/org/slf4j/impl/SimpleLogger.java | 39 +++++++++++++------- 1 files changed, 26 insertions(+), 13 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java

1 0

[qos-ch/slf4j] e8b082: delay initialization until first logger is invoked
by Ceki Gulcu 14 Sep '12

14 Sep '12

Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: e8b082611b42cb319136fb95bac45a32e7f72b1c https://github.com/qos-ch/slf4j/commit/e8b082611b42cb319136fb95bac45a32e7f7… Author: Ceki Gulcu <ceki(a)qos.ch> Date: 2012-09-14 (Fri, 14 Sep 2012) Changed paths: M slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java Log Message: ----------- delay initialization until first logger is invoked

1 0

[GIT] SLF4J: Simple Logging Facade for Java branch master updated. v_1.7.0-8-g3757908
by git-noreply＠pixie.qos.ch 14 Sep '12

14 Sep '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via 37579087aa061cf2861f2aee6fc35a8f17017708 (commit) from 996ccc7ca507994465c069554954ecb01890d4d5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=37579087aa061cf2861f2aee6f… http://github.com/ceki/slf4j/commit/37579087aa061cf2861f2aee6fc35a8f17017708 commit 37579087aa061cf2861f2aee6fc35a8f17017708 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Sep 14 20:51:56 2012 +0200 added levelInBrackets option diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java index 2995b5f..c5540f3 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java @@ -117,7 +117,8 @@ public class SimpleLogger extends MarkerIgnoringBase { private static boolean SHOW_DATE_TIME = false; private static String DATE_TIME_FORMAT_STR = null; private static boolean SHOW_THREAD_NAME = true; - private static String logFile = "System.err"; + private static String LOG_FILE = "System.err"; + private static boolean LEVEL_IN_BRACKETS = false; private static DateFormat DATE_FORMATTER = null; @@ -140,11 +141,13 @@ public class SimpleLogger extends MarkerIgnoringBase { public static final String SHOW_DATE_TIME_KEY = SYSTEM_PREFIX + "showDateTime"; public static final String LOG_FILE_KEY = SYSTEM_PREFIX + "logFile"; + public static final String LEVEL_IN_BRACKETS_KEY = SYSTEM_PREFIX + "levelInBrackets"; + public static final String LOG_KEY_PREFIX = SYSTEM_PREFIX + "log."; private static int DEFAULT_LOG_LEVEL = LOG_LEVEL_INFO; - private static PrintStream TARGET_STREAM = System.err; + private static PrintStream TARGET_STREAM = null; private static String getStringProperty(String name) { String prop = null; @@ -183,10 +186,11 @@ public class SimpleLogger extends MarkerIgnoringBase { SHOW_DATE_TIME = getBooleanProperty(SHOW_DATE_TIME_KEY, SHOW_DATE_TIME); SHOW_THREAD_NAME = getBooleanProperty(SHOW_THREAD_NAME_KEY, SHOW_THREAD_NAME); DATE_TIME_FORMAT_STR = getStringProperty(DATE_TIME_FORMAT_KEY, DATE_TIME_FORMAT_STR); + LEVEL_IN_BRACKETS = getBooleanProperty(LEVEL_IN_BRACKETS_KEY, LEVEL_IN_BRACKETS); - logFile = getStringProperty(LOG_FILE_KEY, logFile); - TARGET_STREAM = computeTargetStream(logFile); + LOG_FILE = getStringProperty(LOG_FILE_KEY, LOG_FILE); + TARGET_STREAM = computeTargetStream(LOG_FILE); if (DATE_TIME_FORMAT_STR != null) { try { @@ -198,9 +202,9 @@ public class SimpleLogger extends MarkerIgnoringBase { } private static PrintStream computeTargetStream(String logFile) { - if("System.err".equalsIgnoreCase(logFile)) + if ("System.err".equalsIgnoreCase(logFile)) return System.err; - else if("System.out".equalsIgnoreCase(logFile)) { + else if ("System.out".equalsIgnoreCase(logFile)) { return System.out; } else { try { @@ -277,16 +281,16 @@ public class SimpleLogger extends MarkerIgnoringBase { return levelString; } - private static int stringToLevel(String lvl) { - if ("trace".equalsIgnoreCase(lvl)) { + private static int stringToLevel(String levelStr) { + if ("trace".equalsIgnoreCase(levelStr)) { return LOG_LEVEL_TRACE; - } else if ("debug".equalsIgnoreCase(lvl)) { + } else if ("debug".equalsIgnoreCase(levelStr)) { return LOG_LEVEL_DEBUG; - } else if ("info".equalsIgnoreCase(lvl)) { + } else if ("info".equalsIgnoreCase(levelStr)) { return LOG_LEVEL_INFO; - } else if ("warn".equalsIgnoreCase(lvl)) { + } else if ("warn".equalsIgnoreCase(levelStr)) { return LOG_LEVEL_WARN; - } else if ("error".equalsIgnoreCase(lvl)) { + } else if ("error".equalsIgnoreCase(levelStr)) { return LOG_LEVEL_ERROR; } // assume INFO by default @@ -327,6 +331,8 @@ public class SimpleLogger extends MarkerIgnoringBase { buf.append("] "); } + if (LEVEL_IN_BRACKETS) buf.append('['); + // Append a readable representation of the log level switch (level) { case LOG_LEVEL_TRACE: @@ -345,6 +351,7 @@ public class SimpleLogger extends MarkerIgnoringBase { buf.append("ERROR"); break; } + if (LEVEL_IN_BRACKETS) buf.append(']'); buf.append(' '); // Append the name of the log instance if so configured @@ -364,7 +371,6 @@ public class SimpleLogger extends MarkerIgnoringBase { void write(StringBuffer buf, Throwable t) { TARGET_STREAM.println(buf.toString()); - // Append stack trace if not null if (t != null) { t.printStackTrace(TARGET_STREAM); } ----------------------------------------------------------------------- Summary of changes: .../src/main/java/org/slf4j/impl/SimpleLogger.java | 32 ++++++++++++-------- 1 files changed, 19 insertions(+), 13 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java

1 0

[qos-ch/slf4j] 375790: added levelInBrackets option
by Ceki Gulcu 14 Sep '12

14 Sep '12

Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: 37579087aa061cf2861f2aee6fc35a8f17017708 https://github.com/qos-ch/slf4j/commit/37579087aa061cf2861f2aee6fc35a8f1701… Author: Ceki Gulcu <ceki(a)qos.ch> Date: 2012-09-14 (Fri, 14 Sep 2012) Changed paths: M slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java Log Message: ----------- added levelInBrackets option

1 0

[GIT] SLF4J: Simple Logging Facade for Java branch master updated. v_1.7.0-7-g996ccc7
by git-noreply＠pixie.qos.ch 14 Sep '12

14 Sep '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via 996ccc7ca507994465c069554954ecb01890d4d5 (commit) via 8efba7f7a89eff0be165636b1b3ff3c5a76887aa (commit) from e96e3290507c8f8bf9f9c1f8811ca9e2f7ac4cd7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=996ccc7ca507994465c0695549… http://github.com/ceki/slf4j/commit/996ccc7ca507994465c069554954ecb01890d4d5 commit 996ccc7ca507994465c069554954ecb01890d4d5 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Sep 14 20:25:30 2012 +0200 added log file support diff --git a/pom.xml b/pom.xml index ba642b2..904e390 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ <cal10n.version>0.7.4</cal10n.version> <log4j.version>1.2.17</log4j.version> <logback.version>1.0.7</logback.version> + <junit.version>4.10</junit.version> </properties> <developers> @@ -69,7 +70,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java index 89d1385..2995b5f 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java @@ -24,7 +24,10 @@ */ package org.slf4j.impl; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.InputStream; +import java.io.PrintStream; import java.security.AccessController; import java.security.PrivilegedAction; import java.text.DateFormat; @@ -105,95 +108,43 @@ import org.slf4j.spi.LocationAwareLogger; public class SimpleLogger extends MarkerIgnoringBase { private static final long serialVersionUID = -632788891211436180L; - - /** - * Mark the time when this class gets loaded into memory. - */ - private static long START_TIME = System.currentTimeMillis(); - private static final String CONFIGURATION_FILE = "simplelogger.properties"; - /** - * All system properties used by <code>SimpleLogger</code> start with this - */ - private static final String systemPrefix = "org.slf4j.simplelogger."; - - /** - * Properties loaded from simplelogger.properties - */ - private static final Properties simpleLoggerProps = new Properties(); - - /** - * Include the instance name in the log message? - */ + private static long START_TIME = System.currentTimeMillis(); + private static final Properties SIMPLE_LOGGER_PROPS = new Properties(); private static boolean SHOW_LOG_NAME = true; - /** - * Include the short name ( last component ) of the logger in the log - * message. Defaults to true - otherwise we'll be lost in a flood of - * messages without knowing who sends them. - */ - private static boolean SHOW_SHORT_NAME = false; - /** - * Include the current time in the log message - */ + private static boolean SHOW_SHORT_LOG_NAME = false; private static boolean SHOW_DATE_TIME = false; - - /** - * The date and time format to use in the log message - */ private static String DATE_TIME_FORMAT_STR = null; - - /** - * Include the current thread name in the log message - */ private static boolean SHOW_THREAD_NAME = true; + private static String logFile = "System.err"; - /** - * The log file to write to. Default is null. - */ - private static String logFile = null; - /** - * Used to format times. - * - * Any code that accesses this object should first obtain a lock on it, - * ie use synchronized(dateFormatter); this requirement is - * to fix an existing thread safety bug (SimpleDateFormat.format - * is not thread-safe). - */ private static DateFormat DATE_FORMATTER = null; - /** - * "Trace" level logging. - */ - public static final int LOG_LEVEL_TRACE = LocationAwareLogger.TRACE_INT; - /** - * "Debug" level logging. - */ - public static final int LOG_LEVEL_DEBUG = LocationAwareLogger.DEBUG_INT; - /** - * "Info" level logging. - */ - public static final int LOG_LEVEL_INFO = LocationAwareLogger.INFO_INT; - /** - * "Warn" level logging. - */ - public static final int LOG_LEVEL_WARN = LocationAwareLogger.WARN_INT; - /** - * "Error" level logging. - */ - public static final int LOG_LEVEL_ERROR = LocationAwareLogger.ERROR_INT; + private static final int LOG_LEVEL_TRACE = LocationAwareLogger.TRACE_INT; + private static final int LOG_LEVEL_DEBUG = LocationAwareLogger.DEBUG_INT; + private static final int LOG_LEVEL_INFO = LocationAwareLogger.INFO_INT; + private static final int LOG_LEVEL_WARN = LocationAwareLogger.WARN_INT; + private static final int LOG_LEVEL_ERROR = LocationAwareLogger.ERROR_INT; /** - * Enable all logging levels + * All system properties used by <code>SimpleLogger</code> start with this prefix */ - //public static final int LOG_LEVEL_ALL = (LOG_LEVEL_TRACE - 10); + public static final String SYSTEM_PREFIX = "org.slf4j.simpleLogger."; - /** - * Enable no logging levels - */ - //public static final int LOG_LEVEL_OFF = (LOG_LEVEL_ERROR + 10); + public static final String DEFAULT_LOG_KEY = SYSTEM_PREFIX + "defaultLog"; + public static final String SHOW_LOG_NAME_KEY = SYSTEM_PREFIX + "showLogName"; + public static final String SHOW_SHORT_LOG_NAME_KEY = SYSTEM_PREFIX + "showShortLogName"; + public static final String SHOW_THREAD_NAME_KEY = SYSTEM_PREFIX + "showThreadName"; + public static final String DATE_TIME_FORMAT_KEY = SYSTEM_PREFIX + "dateTimeFormat"; + public static final String SHOW_DATE_TIME_KEY = SYSTEM_PREFIX + "showDateTime"; + public static final String LOG_FILE_KEY = SYSTEM_PREFIX + "logFile"; + + public static final String LOG_KEY_PREFIX = SYSTEM_PREFIX + "log."; - private static int defaultLogLevel = LOG_LEVEL_INFO; + + private static int DEFAULT_LOG_LEVEL = LOG_LEVEL_INFO; + private static PrintStream TARGET_STREAM = System.err; private static String getStringProperty(String name) { String prop = null; @@ -202,7 +153,7 @@ public class SimpleLogger extends MarkerIgnoringBase { } catch (SecurityException e) { ; // Ignore } - return (prop == null) ? simpleLoggerProps.getProperty(name) : prop; + return (prop == null) ? SIMPLE_LOGGER_PROPS.getProperty(name) : prop; } private static String getStringProperty(String name, String defaultValue) { @@ -220,6 +171,50 @@ public class SimpleLogger extends MarkerIgnoringBase { // Load properties file, if found. // Override with system properties. static { + loadProperties(); + + + String defaultLogLevelString = getStringProperty(DEFAULT_LOG_KEY, null); + if (defaultLogLevelString != null) + DEFAULT_LOG_LEVEL = stringToLevel(defaultLogLevelString); + + SHOW_LOG_NAME = getBooleanProperty(SHOW_LOG_NAME_KEY, SHOW_LOG_NAME); + SHOW_SHORT_LOG_NAME = getBooleanProperty(SHOW_SHORT_LOG_NAME_KEY, SHOW_SHORT_LOG_NAME); + SHOW_DATE_TIME = getBooleanProperty(SHOW_DATE_TIME_KEY, SHOW_DATE_TIME); + SHOW_THREAD_NAME = getBooleanProperty(SHOW_THREAD_NAME_KEY, SHOW_THREAD_NAME); + DATE_TIME_FORMAT_STR = getStringProperty(DATE_TIME_FORMAT_KEY, DATE_TIME_FORMAT_STR); + + + logFile = getStringProperty(LOG_FILE_KEY, logFile); + TARGET_STREAM = computeTargetStream(logFile); + + if (DATE_TIME_FORMAT_STR != null) { + try { + DATE_FORMATTER = new SimpleDateFormat(DATE_TIME_FORMAT_STR); + } catch (IllegalArgumentException e) { + Util.report("Bad date format in " + CONFIGURATION_FILE + "; will default to relative time ", e); + } + } + } + + private static PrintStream computeTargetStream(String logFile) { + if("System.err".equalsIgnoreCase(logFile)) + return System.err; + else if("System.out".equalsIgnoreCase(logFile)) { + return System.out; + } else { + try { + FileOutputStream fos = new FileOutputStream(logFile); + PrintStream printStream = new PrintStream(fos); + return printStream; + } catch (FileNotFoundException e) { + Util.report("Could not open [" + logFile + "]. Defaulting to System.err", e); + return System.err; + } + } + } + + private static void loadProperties() { // Add props from the resource simplelogger.properties InputStream in = (InputStream) AccessController.doPrivileged( new PrivilegedAction() { @@ -234,32 +229,12 @@ public class SimpleLogger extends MarkerIgnoringBase { }); if (null != in) { try { - simpleLoggerProps.load(in); + SIMPLE_LOGGER_PROPS.load(in); in.close(); } catch (java.io.IOException e) { // ignored } } - - String defaultLogLevelString = getStringProperty(systemPrefix + "defaultLog", null); - if (defaultLogLevelString != null) - defaultLogLevel = stringToLevel(defaultLogLevelString); - - SHOW_LOG_NAME = getBooleanProperty(systemPrefix + "showLogName", SHOW_LOG_NAME); - SHOW_SHORT_NAME = getBooleanProperty(systemPrefix + "showShortLogName", SHOW_SHORT_NAME); - SHOW_DATE_TIME = getBooleanProperty(systemPrefix + "showDateTime", SHOW_DATE_TIME); - SHOW_THREAD_NAME = getBooleanProperty(systemPrefix + "showThreadName", SHOW_THREAD_NAME); - DATE_TIME_FORMAT_STR = getStringProperty(systemPrefix + "dateTimeFormat", DATE_TIME_FORMAT_STR); - - logFile = getStringProperty(systemPrefix + "logFile", logFile); - - if (DATE_TIME_FORMAT_STR != null) { - try { - DATE_FORMATTER = new SimpleDateFormat(DATE_TIME_FORMAT_STR); - } catch (IllegalArgumentException e) { - Util.report("Bad date format in " + CONFIGURATION_FILE + "; will default to relative time ", e); - } - } } @@ -281,23 +256,25 @@ public class SimpleLogger extends MarkerIgnoringBase { SimpleLogger(String name) { this.name = name; - // Set initial log level - this.currentLogLevel = LOG_LEVEL_INFO; - - // Set log level from properties - String lvl = getStringProperty(systemPrefix + "log." + name); - int i = String.valueOf(name).lastIndexOf("."); - while (null == lvl && i > -1) { - name = name.substring(0, i); - lvl = getStringProperty(systemPrefix + "log." + name); - i = String.valueOf(name).lastIndexOf("."); + String levelString = recursivelyComputeLevelString(); + if (levelString != null) { + this.currentLogLevel = stringToLevel(levelString); + } else { + this.currentLogLevel = DEFAULT_LOG_LEVEL; } - if (null == lvl) { - lvl = getStringProperty(systemPrefix + "defaultlog"); - } + } - this.currentLogLevel = stringToLevel(lvl); + String recursivelyComputeLevelString() { + String tempName = name; + String levelString = null; + int indexOfLastDot = tempName.length(); + while ((levelString == null) && (indexOfLastDot > -1)) { + tempName = tempName.substring(0, indexOfLastDot); + levelString = getStringProperty(LOG_KEY_PREFIX + tempName, null); + indexOfLastDot = String.valueOf(tempName).lastIndexOf("."); + } + return levelString; } private static int stringToLevel(String lvl) { @@ -371,7 +348,7 @@ public class SimpleLogger extends MarkerIgnoringBase { buf.append(' '); // Append the name of the log instance if so configured - if (SHOW_SHORT_NAME) { + if (SHOW_SHORT_LOG_NAME) { if (shortLogName == null) shortLogName = computeShortName(); buf.append(String.valueOf(shortLogName)).append(" - "); } else if (SHOW_LOG_NAME) { @@ -381,12 +358,17 @@ public class SimpleLogger extends MarkerIgnoringBase { // Append the message buf.append(message); - System.err.println(buf.toString()); + write(buf, t); + + } + + void write(StringBuffer buf, Throwable t) { + TARGET_STREAM.println(buf.toString()); // Append stack trace if not null if (t != null) { - t.printStackTrace(System.err); + t.printStackTrace(TARGET_STREAM); } - System.err.flush(); + TARGET_STREAM.flush(); } private String getFormattedDate() { diff --git a/slf4j-simple/src/test/java/org/slf4j/impl/SimpleLoggerTest.java b/slf4j-simple/src/test/java/org/slf4j/impl/SimpleLoggerTest.java new file mode 100644 index 0000000..d762c13 --- /dev/null +++ b/slf4j-simple/src/test/java/org/slf4j/impl/SimpleLoggerTest.java @@ -0,0 +1,72 @@ +/** + * Copyright (c) 2004-2012 QOS.ch + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ +package org.slf4j.impl; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNull; + +public class SimpleLoggerTest { + + String A_KEY = SimpleLogger.LOG_KEY_PREFIX+"a"; + + @Before public void before() { + System.setProperty(A_KEY, "info"); + } + + @After public void after() { + System.clearProperty(A_KEY); + } + + @Test + public void loggerNameWithNoDots_WithLevel() { + SimpleLogger simpleLogger = new SimpleLogger("a"); + assertEquals("info", simpleLogger.recursivelyComputeLevelString()); + } + + @Test + public void loggerNameWithOneDotShouldInheritFromParent() { + SimpleLogger simpleLogger = new SimpleLogger("a.b"); + assertEquals("info", simpleLogger.recursivelyComputeLevelString()); + } + + + @Test + public void loggerNameWithNoDots_WithNoSetLevel() { + SimpleLogger simpleLogger = new SimpleLogger("x"); + assertNull(simpleLogger.recursivelyComputeLevelString()); + } + + @Test + public void loggerNameWithOneDot_NoSetLevel() { + SimpleLogger simpleLogger = new SimpleLogger("x.y"); + assertNull(simpleLogger.recursivelyComputeLevelString()); + } + + +} http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=8efba7f7a89eff0be165636b1b… http://github.com/ceki/slf4j/commit/8efba7f7a89eff0be165636b1b3ff3c5a76887aa commit 8efba7f7a89eff0be165636b1b3ff3c5a76887aa Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Sep 14 19:25:04 2012 +0200 have all tests pass diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java index 0d61714..89d1385 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java @@ -44,30 +44,30 @@ import org.slf4j.spi.LocationAwareLogger; * for all defined loggers, to the console ({@code System.err}). * The following system properties are supported to configure the behavior of this logger: * <ul> - * <li><code>org.slf4j.simplelogger.defaultlog</code> - + * <li><code>org.slf4j.simpleLogger.defaultLog</code> - * Default logging detail level for all instances of SimpleLogger. * Must be one of ("trace", "debug", "info", "warn", or "error"). * If not specified, defaults to "info". </li> - * <li><code>org.slf4j.simplelogger.log.xxxxx</code> - + * <li><code>org.slf4j.simpleLogger.log.xxxxx</code> - * Logging detail level for a SimpleLogger instance named "xxxxx". * Must be one of ("trace", "debug", "info", "warn", or "error"). * If not specified, the default logging detail level is used.</li> - * <li><code>org.slf4j.simplelogger.showdatetime</code> - + * <li><code>org.slf4j.simpleLogger.showDateTime</code> - * Set to <code>true</code> if you want the current date and time * to be included in output messages. Default is <code>true</code></li> - * <li><code>org.slf4j.simplelogger.dateTimeFormat</code> - + * <li><code>org.slf4j.simpleLogger.dateTimeFormat</code> - * The date and time format to be used in the output messages. * The pattern describing the date and time format is the same that is * used in <code>java.text.SimpleDateFormat</code>. If the format is not - * specified or is invalid, the number of milliseonds since start up will be output. + * specified or is invalid, the number of milliseconds since start up will be output. * </li> - * <li><code>org.slf4j.simplelogger.showthreadname</code> - + * <li><code>org.slf4j.simpleLogger.showThreadName</code> - * Set to <code>true</code> if you want to output the current thread name. * Defaults to <code>true</code>.</li> - * <li><code>org.slf4j.simplelogger.showlogname</code> - + * <li><code>org.slf4j.simpleLogger.showLogName</code> - * Set to <code>true</code> if you want the Logger instance name to be * included in output messages. Defaults to <code>true</code>.</li> - * <li><code>org.slf4j.simplelogger.showShortLogname</code> - + * <li><code>org.slf4j.simpleLogger.showShortLogName</code> - * Set to <code>true</code> if you want the last component of the name to be * included in output messages. Defaults to <code>false</code>.</li> * </ul> @@ -241,20 +241,24 @@ public class SimpleLogger extends MarkerIgnoringBase { } } - SHOW_LOG_NAME = getBooleanProperty(systemPrefix + "showlogname", SHOW_LOG_NAME); - SHOW_SHORT_NAME = getBooleanProperty(systemPrefix + "showShortLogname", SHOW_SHORT_NAME); - SHOW_DATE_TIME = getBooleanProperty(systemPrefix + "showdatetime", SHOW_DATE_TIME); - SHOW_THREAD_NAME = getBooleanProperty(systemPrefix + "showthreadname", SHOW_THREAD_NAME); - DATE_TIME_FORMAT_STR = getStringProperty(systemPrefix + "dateTimeFormat", DATE_TIME_FORMAT_STR); - logFile = getStringProperty(systemPrefix + "logFile", logFile); - String defaultLogLevelString = getStringProperty(systemPrefix + "defaultlog", null); + String defaultLogLevelString = getStringProperty(systemPrefix + "defaultLog", null); if (defaultLogLevelString != null) defaultLogLevel = stringToLevel(defaultLogLevelString); - try { - DATE_FORMATTER = new SimpleDateFormat(DATE_TIME_FORMAT_STR); - } catch (IllegalArgumentException e) { - Util.report("Bad date format in " + CONFIGURATION_FILE + "; will default to relative time ", e); + SHOW_LOG_NAME = getBooleanProperty(systemPrefix + "showLogName", SHOW_LOG_NAME); + SHOW_SHORT_NAME = getBooleanProperty(systemPrefix + "showShortLogName", SHOW_SHORT_NAME); + SHOW_DATE_TIME = getBooleanProperty(systemPrefix + "showDateTime", SHOW_DATE_TIME); + SHOW_THREAD_NAME = getBooleanProperty(systemPrefix + "showThreadName", SHOW_THREAD_NAME); + DATE_TIME_FORMAT_STR = getStringProperty(systemPrefix + "dateTimeFormat", DATE_TIME_FORMAT_STR); + + logFile = getStringProperty(systemPrefix + "logFile", logFile); + + if (DATE_TIME_FORMAT_STR != null) { + try { + DATE_FORMATTER = new SimpleDateFormat(DATE_TIME_FORMAT_STR); + } catch (IllegalArgumentException e) { + Util.report("Bad date format in " + CONFIGURATION_FILE + "; will default to relative time ", e); + } } } diff --git a/slf4j-simple/src/test/resources/simplelogger.properties b/slf4j-simple/src/test/resources/simplelogger.properties index dc9d4f0..8ab1740 100644 --- a/slf4j-simple/src/test/resources/simplelogger.properties +++ b/slf4j-simple/src/test/resources/simplelogger.properties @@ -4,31 +4,31 @@ # Default logging detail level for all instances of SimpleLogger. # Must be one of ("trace", "debug", "info", "warn", or "error"). # If not specified, defaults to "info". -#org.slf4j.simplelogger.defaultlog=info +#org.slf4j.simpleLogger.defaultLog=info # Logging detail level for a SimpleLogger instance named "xxxxx". # Must be one of ("trace", "debug", "info", "warn", or "error"). # If not specified, the default logging detail level is used. -#org.slf4j.simplelogger.log.xxxxx= +#org.slf4j.simpleLogger.log.xxxxx= # Set to true if you want the current date and time to be included in output messages. # Default is false, and will output the number of milliseconds elapsed since startup. -#org.slf4j.simplelogger.showdatetime=false +#org.slf4j.simpleLogger.showDateTime=false # The date and time format to be used in the output messages. # The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat. # If the format is not specified or is invalid, the default format is used. # The default format is yyyy-MM-dd HH:mm:ss:SSS Z. -#org.slf4j.simplelogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z +#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z # Set to true if you want to output the current thread name. # Defaults to true. -#org.slf4j.simplelogger.showthreadname=true +#org.slf4j.simpleLogger.showThreadName=true # Set to true if you want the Logger instance name to be included in output messages. # Defaults to true. -#org.slf4j.simplelogger.showlogname=true +#org.slf4j.simpleLogger.showLogName=true # Set to true if you want the last component of the name to be included in output messages. # Defaults to false. -#org.slf4j.simplelogger.showShortLogname=false +#org.slf4j.simpleLogger.showShortLogName=false ----------------------------------------------------------------------- Summary of changes: pom.xml | 3 +- .../src/main/java/org/slf4j/impl/SimpleLogger.java | 224 +++++++++----------- .../test/java/org/slf4j/impl/SimpleLoggerTest.java | 64 +++--- .../src/test/resources/simplelogger.properties | 14 +- 4 files changed, 144 insertions(+), 161 deletions(-) copy slf4j-jdk14/src/test/java/org/slf4j/impl/PerfTest.java => slf4j-simple/src/test/java/org/slf4j/impl/SimpleLoggerTest.java (51%) hooks/post-receive -- SLF4J: Simple Logging Facade for Java

1 0

[qos-ch/slf4j] 8efba7: have all tests pass
by Ceki Gulcu 14 Sep '12

14 Sep '12

Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: 8efba7f7a89eff0be165636b1b3ff3c5a76887aa https://github.com/qos-ch/slf4j/commit/8efba7f7a89eff0be165636b1b3ff3c5a768… Author: Ceki Gulcu <ceki(a)qos.ch> Date: 2012-09-14 (Fri, 14 Sep 2012) Changed paths: M slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java M slf4j-simple/src/test/resources/simplelogger.properties Log Message: ----------- have all tests pass Commit: 996ccc7ca507994465c069554954ecb01890d4d5 https://github.com/qos-ch/slf4j/commit/996ccc7ca507994465c069554954ecb01890… Author: Ceki Gulcu <ceki(a)qos.ch> Date: 2012-09-14 (Fri, 14 Sep 2012) Changed paths: M pom.xml M slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java A slf4j-simple/src/test/java/org/slf4j/impl/SimpleLoggerTest.java Log Message: ----------- added log file support Compare: https://github.com/qos-ch/slf4j/compare/e96e3290507c...996ccc7ca507

1 0

[GIT] SLF4J: Simple Logging Facade for Java branch master updated. v_1.7.0-5-ge96e329
by git-noreply＠pixie.qos.ch 14 Sep '12

14 Sep '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via e96e3290507c8f8bf9f9c1f8811ca9e2f7ac4cd7 (commit) from beb834f2cab2b4c2e5a4fb34410ca78284b6030c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=e96e3290507c8f8bf9f9c1f881… http://github.com/ceki/slf4j/commit/e96e3290507c8f8bf9f9c1f8811ca9e2f7ac4cd7 commit e96e3290507c8f8bf9f9c1f8811ca9e2f7ac4cd7 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Sep 14 19:12:47 2012 +0200 refactoring to improve readability diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java index 05d7e75..0d61714 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java @@ -22,7 +22,6 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ - package org.slf4j.impl; import java.io.InputStream; @@ -46,59 +45,54 @@ import org.slf4j.spi.LocationAwareLogger; * The following system properties are supported to configure the behavior of this logger: * <ul> * <li><code>org.slf4j.simplelogger.defaultlog</code> - - * Default logging detail level for all instances of SimpleLogger. - * Must be one of ("trace", "debug", "info", "warn", or "error"). - * If not specified, defaults to "info". </li> + * Default logging detail level for all instances of SimpleLogger. + * Must be one of ("trace", "debug", "info", "warn", or "error"). + * If not specified, defaults to "info". </li> * <li><code>org.slf4j.simplelogger.log.xxxxx</code> - - * Logging detail level for a SimpleLogger instance named "xxxxx". - * Must be one of ("trace", "debug", "info", "warn", or "error"). - * If not specified, the default logging detail level is used.</li> + * Logging detail level for a SimpleLogger instance named "xxxxx". + * Must be one of ("trace", "debug", "info", "warn", or "error"). + * If not specified, the default logging detail level is used.</li> * <li><code>org.slf4j.simplelogger.showdatetime</code> - - * Set to <code>true</code> if you want the current date and time - * to be included in output messages. Default is <code>false</code>, - * and will output the number of milliseconds elapsed since startup.</li> + * Set to <code>true</code> if you want the current date and time + * to be included in output messages. Default is <code>true</code></li> * <li><code>org.slf4j.simplelogger.dateTimeFormat</code> - - * The date and time format to be used in the output messages. - * The pattern describing the date and time format is the same that is - * used in <code>java.text.SimpleDateFormat</code>. If the format is not - * specified or is invalid, the default format is used. - * The default format is <code>yyyy-MM-dd HH:mm:ss:SSS Z</code>.</li> + * The date and time format to be used in the output messages. + * The pattern describing the date and time format is the same that is + * used in <code>java.text.SimpleDateFormat</code>. If the format is not + * specified or is invalid, the number of milliseonds since start up will be output. + * </li> * <li><code>org.slf4j.simplelogger.showthreadname</code> - - * Set to <code>true</code> if you want to output the current thread name. - * Defaults to <code>true</code>.</li> + * Set to <code>true</code> if you want to output the current thread name. + * Defaults to <code>true</code>.</li> * <li><code>org.slf4j.simplelogger.showlogname</code> - - * Set to <code>true</code> if you want the Logger instance name to be - * included in output messages. Defaults to <code>true</code>.</li> + * Set to <code>true</code> if you want the Logger instance name to be + * included in output messages. Defaults to <code>true</code>.</li> * <li><code>org.slf4j.simplelogger.showShortLogname</code> - - * Set to <code>true</code> if you want the last component of the name to be - * included in output messages. Defaults to <code>false</code>.</li> + * Set to <code>true</code> if you want the last component of the name to be + * included in output messages. Defaults to <code>false</code>.</li> * </ul> - * * In addition to looking for system properties with the names specified * above, this implementation also checks for a class loader resource named * <code>"simplelogger.properties"</code>, and includes any matching definitions * from this resource (if it exists). - * - * * With no configurationn, the default output includes the relative time in milliseconds, * thread name, the level, logger name, and the message followed by the line * separator for the host. In log4j terms it amounts to the "%r [%t] * %level %logger - %m%n" pattern. - * * Sample output follows. -<pre> -176 [main] INFO examples.Sort - Populating an array of 2 elements in reverse order. -225 [main] INFO examples.SortAlgo - Entered the sort method. -304 [main] INFO examples.SortAlgo - Dump of integer array: -317 [main] INFO examples.SortAlgo - Element [0] = 0 -331 [main] INFO examples.SortAlgo - Element [1] = 1 -343 [main] INFO examples.Sort - The next log statement should be an error message. -346 [main] ERROR examples.SortAlgo - Tried to dump an uninitialized array. - at org.log4j.examples.SortAlgo.dump(SortAlgo.java:58) - at org.log4j.examples.Sort.main(Sort.java:64) -467 [main] INFO examples.Sort - Exiting main method. -</pre> - * + * <pre> + * 176 [main] INFO examples.Sort - Populating an array of 2 elements in reverse order. + * 225 [main] INFO examples.SortAlgo - Entered the sort method. + * 304 [main] INFO examples.SortAlgo - Dump of integer array: + * 317 [main] INFO examples.SortAlgo - Element [0] = 0 + * 331 [main] INFO examples.SortAlgo - Element [1] = 1 + * 343 [main] INFO examples.Sort - The next log statement should be an error message. + * 346 [main] ERROR examples.SortAlgo - Tried to dump an uninitialized array. + * at org.log4j.examples.SortAlgo.dump(SortAlgo.java:58) + * at org.log4j.examples.Sort.main(Sort.java:64) + * 467 [main] INFO examples.Sort - Exiting main method. + * </pre> + * * This implementation is heavily inspired by * <a href="http://commons.apache.org/logging/">Apache Commons Logging</a>'s SimpleLog. * @@ -115,134 +109,165 @@ public class SimpleLogger extends MarkerIgnoringBase { /** * Mark the time when this class gets loaded into memory. */ - private static long startTime = System.currentTimeMillis(); + private static long START_TIME = System.currentTimeMillis(); private static final String CONFIGURATION_FILE = "simplelogger.properties"; - /** All system properties used by <code>SimpleLogger</code> start with this */ + /** + * All system properties used by <code>SimpleLogger</code> start with this + */ private static final String systemPrefix = "org.slf4j.simplelogger."; - /** Properties loaded from simplelogger.properties */ + /** + * Properties loaded from simplelogger.properties + */ private static final Properties simpleLoggerProps = new Properties(); - /** The default format to use when formating dates */ - private static final String DEFAULT_DATE_TIME_FORMAT = - "yyyy-MM-dd HH:mm:ss:SSS Z"; + /** + * Include the instance name in the log message? + */ + private static boolean SHOW_LOG_NAME = true; + /** + * Include the short name ( last component ) of the logger in the log + * message. Defaults to true - otherwise we'll be lost in a flood of + * messages without knowing who sends them. + */ + private static boolean SHOW_SHORT_NAME = false; + /** + * Include the current time in the log message + */ + private static boolean SHOW_DATE_TIME = false; - /** Include the instance name in the log message? */ - private static boolean showLogName = true; - /** Include the short name ( last component ) of the logger in the log - * message. Defaults to true - otherwise we'll be lost in a flood of - * messages without knowing who sends them. + /** + * The date and time format to use in the log message */ - private static boolean showShortName = false; - /** Include the current time in the log message */ - private static boolean showDateTime = false; - /** The date and time format to use in the log message */ - private static String dateTimeFormat = DEFAULT_DATE_TIME_FORMAT; + private static String DATE_TIME_FORMAT_STR = null; - /** Include the current thread name in the log message */ - private static boolean showThreadName = true; + /** + * Include the current thread name in the log message + */ + private static boolean SHOW_THREAD_NAME = true; /** + * The log file to write to. Default is null. + */ + private static String logFile = null; + /** * Used to format times. - * + * * Any code that accesses this object should first obtain a lock on it, * ie use synchronized(dateFormatter); this requirement is * to fix an existing thread safety bug (SimpleDateFormat.format * is not thread-safe). */ - private static DateFormat dateFormatter = null; + private static DateFormat DATE_FORMATTER = null; - /** "Trace" level logging. */ - public static final int LOG_LEVEL_TRACE = LocationAwareLogger.TRACE_INT; - /** "Debug" level logging. */ - public static final int LOG_LEVEL_DEBUG = LocationAwareLogger.DEBUG_INT; - /** "Info" level logging. */ - public static final int LOG_LEVEL_INFO = LocationAwareLogger.INFO_INT; - /** "Warn" level logging. */ - public static final int LOG_LEVEL_WARN = LocationAwareLogger.WARN_INT; - /** "Error" level logging. */ - public static final int LOG_LEVEL_ERROR = LocationAwareLogger.ERROR_INT; - /** "Fatal" level logging. */ -// public static final int LOG_LEVEL_FATAL = 6; + /** + * "Trace" level logging. + */ + public static final int LOG_LEVEL_TRACE = LocationAwareLogger.TRACE_INT; + /** + * "Debug" level logging. + */ + public static final int LOG_LEVEL_DEBUG = LocationAwareLogger.DEBUG_INT; + /** + * "Info" level logging. + */ + public static final int LOG_LEVEL_INFO = LocationAwareLogger.INFO_INT; + /** + * "Warn" level logging. + */ + public static final int LOG_LEVEL_WARN = LocationAwareLogger.WARN_INT; + /** + * "Error" level logging. + */ + public static final int LOG_LEVEL_ERROR = LocationAwareLogger.ERROR_INT; - /** Enable all logging levels */ - public static final int LOG_LEVEL_ALL = (LOG_LEVEL_TRACE - 10); + /** + * Enable all logging levels + */ + //public static final int LOG_LEVEL_ALL = (LOG_LEVEL_TRACE - 10); - /** Enable no logging levels */ - public static final int LOG_LEVEL_OFF = (LOG_LEVEL_ERROR + 10); + /** + * Enable no logging levels + */ + //public static final int LOG_LEVEL_OFF = (LOG_LEVEL_ERROR + 10); + private static int defaultLogLevel = LOG_LEVEL_INFO; private static String getStringProperty(String name) { - String prop = null; - try { - prop = System.getProperty(name); - } catch (SecurityException e) { - ; // Ignore - } - return (prop == null) ? simpleLoggerProps.getProperty(name) : prop; + String prop = null; + try { + prop = System.getProperty(name); + } catch (SecurityException e) { + ; // Ignore + } + return (prop == null) ? simpleLoggerProps.getProperty(name) : prop; } private static String getStringProperty(String name, String defaultValue) { - String prop = getStringProperty(name); - return (prop == null) ? defaultValue : prop; + String prop = getStringProperty(name); + return (prop == null) ? defaultValue : prop; } private static boolean getBooleanProperty(String name, boolean defaultValue) { - String prop = getStringProperty(name); - return (prop == null) ? defaultValue : "true".equalsIgnoreCase(prop); + String prop = getStringProperty(name); + return (prop == null) ? defaultValue : "true".equalsIgnoreCase(prop); } + // Initialize class attributes. // Load properties file, if found. // Override with system properties. static { - // Add props from the resource simplelogger.properties - InputStream in = (InputStream)AccessController.doPrivileged( - new PrivilegedAction() { - public Object run() { - ClassLoader threadCL = Thread.currentThread().getContextClassLoader(); - if (threadCL != null) { - return threadCL.getResourceAsStream(CONFIGURATION_FILE); - } else { - return ClassLoader.getSystemResourceAsStream(CONFIGURATION_FILE); - } - } - }); - if(null != in) { - try { - simpleLoggerProps.load(in); - in.close(); - } catch(java.io.IOException e) { - // ignored - } + // Add props from the resource simplelogger.properties + InputStream in = (InputStream) AccessController.doPrivileged( + new PrivilegedAction() { + public Object run() { + ClassLoader threadCL = Thread.currentThread().getContextClassLoader(); + if (threadCL != null) { + return threadCL.getResourceAsStream(CONFIGURATION_FILE); + } else { + return ClassLoader.getSystemResourceAsStream(CONFIGURATION_FILE); + } + } + }); + if (null != in) { + try { + simpleLoggerProps.load(in); + in.close(); + } catch (java.io.IOException e) { + // ignored } + } - showLogName = getBooleanProperty(systemPrefix + "showlogname", showLogName); - showShortName = getBooleanProperty(systemPrefix + "showShortLogname", showShortName); - showDateTime = getBooleanProperty(systemPrefix + "showdatetime", showDateTime); - showThreadName = getBooleanProperty(systemPrefix + "showthreadname", showThreadName); - dateTimeFormat = getStringProperty(systemPrefix + "dateTimeFormat", dateTimeFormat); + SHOW_LOG_NAME = getBooleanProperty(systemPrefix + "showlogname", SHOW_LOG_NAME); + SHOW_SHORT_NAME = getBooleanProperty(systemPrefix + "showShortLogname", SHOW_SHORT_NAME); + SHOW_DATE_TIME = getBooleanProperty(systemPrefix + "showdatetime", SHOW_DATE_TIME); + SHOW_THREAD_NAME = getBooleanProperty(systemPrefix + "showthreadname", SHOW_THREAD_NAME); + DATE_TIME_FORMAT_STR = getStringProperty(systemPrefix + "dateTimeFormat", DATE_TIME_FORMAT_STR); + logFile = getStringProperty(systemPrefix + "logFile", logFile); + String defaultLogLevelString = getStringProperty(systemPrefix + "defaultlog", null); + if (defaultLogLevelString != null) + defaultLogLevel = stringToLevel(defaultLogLevelString); - if(showDateTime) { - try { - dateFormatter = new SimpleDateFormat(dateTimeFormat); - } catch(IllegalArgumentException e) { - Util.report("Bad date format in " + CONFIGURATION_FILE + "; reverting to default", e); - // If the format pattern is invalid - use the default format - dateTimeFormat = DEFAULT_DATE_TIME_FORMAT; - dateFormatter = new SimpleDateFormat(dateTimeFormat); - } - } + try { + DATE_FORMATTER = new SimpleDateFormat(DATE_TIME_FORMAT_STR); + } catch (IllegalArgumentException e) { + Util.report("Bad date format in " + CONFIGURATION_FILE + "; will default to relative time ", e); + } } /** The name of this simple log instance */ //protected String logName = null;// == name - /** The current log level */ + /** + * The current log level + */ protected int currentLogLevel = LOG_LEVEL_INFO; - /** The short name of this simple log instance */ + /** + * The short name of this simple log instance + */ private transient String shortLogName = null; /** @@ -258,33 +283,33 @@ public class SimpleLogger extends MarkerIgnoringBase { // Set log level from properties String lvl = getStringProperty(systemPrefix + "log." + name); int i = String.valueOf(name).lastIndexOf("."); - while(null == lvl && i > -1) { - name = name.substring(0,i); - lvl = getStringProperty(systemPrefix + "log." + name); - i = String.valueOf(name).lastIndexOf("."); + while (null == lvl && i > -1) { + name = name.substring(0, i); + lvl = getStringProperty(systemPrefix + "log." + name); + i = String.valueOf(name).lastIndexOf("."); } - if(null == lvl) { - lvl = getStringProperty(systemPrefix + "defaultlog"); + if (null == lvl) { + lvl = getStringProperty(systemPrefix + "defaultlog"); } - if("all".equalsIgnoreCase(lvl)) { - this.currentLogLevel = LOG_LEVEL_ALL; - } else if("trace".equalsIgnoreCase(lvl)) { - this.currentLogLevel = LOG_LEVEL_TRACE; - } else if("debug".equalsIgnoreCase(lvl)) { - this.currentLogLevel = LOG_LEVEL_DEBUG; - } else if("info".equalsIgnoreCase(lvl)) { - this.currentLogLevel = LOG_LEVEL_INFO; - } else if("warn".equalsIgnoreCase(lvl)) { - this.currentLogLevel = LOG_LEVEL_WARN; - } else if("error".equalsIgnoreCase(lvl)) { - this.currentLogLevel = LOG_LEVEL_ERROR; -// } else if("fatal".equalsIgnoreCase(lvl)) { -// setLevel(LOG_LEVEL_FATAL); - } else if("off".equalsIgnoreCase(lvl)) { - this.currentLogLevel = LOG_LEVEL_OFF; + this.currentLogLevel = stringToLevel(lvl); + } + + private static int stringToLevel(String lvl) { + if ("trace".equalsIgnoreCase(lvl)) { + return LOG_LEVEL_TRACE; + } else if ("debug".equalsIgnoreCase(lvl)) { + return LOG_LEVEL_DEBUG; + } else if ("info".equalsIgnoreCase(lvl)) { + return LOG_LEVEL_INFO; + } else if ("warn".equalsIgnoreCase(lvl)) { + return LOG_LEVEL_WARN; + } else if ("error".equalsIgnoreCase(lvl)) { + return LOG_LEVEL_ERROR; } + // assume INFO by default + return LOG_LEVEL_INFO; } @@ -292,60 +317,61 @@ public class SimpleLogger extends MarkerIgnoringBase { * This is our internal implementation for logging regular (non-parameterized) * log messages. * - * @param level One of the LOG_LEVEL_XXX constants defining the log level + * @param level One of the LOG_LEVEL_XXX constants defining the log level * @param message The message itself - * @param t The exception whose stack trace should be logged + * @param t The exception whose stack trace should be logged */ private void log(int level, String message, Throwable t) { - if (! isLevelEnabled(level)) { + if (!isLevelEnabled(level)) { return; } StringBuffer buf = new StringBuffer(32); // Append date-time if so configured - if(showDateTime) { - Date now = new Date(); - String dateText; - synchronized(dateFormatter) { - dateText = dateFormatter.format(now); + if (SHOW_DATE_TIME) { + if (DATE_FORMATTER != null) { + buf.append(getFormattedDate()); + buf.append(' '); + } else { + buf.append(System.currentTimeMillis() - START_TIME); + buf.append(' '); } - buf.append(dateText); - buf.append(' '); - } else { - buf.append(System.currentTimeMillis() - startTime); - buf.append(' '); } // Append current thread name if so configured - if (showThreadName) { + if (SHOW_THREAD_NAME) { buf.append('['); buf.append(Thread.currentThread().getName()); buf.append("] "); - } + } // Append a readable representation of the log level - switch(level) { - case LOG_LEVEL_TRACE: buf.append("TRACE"); break; - case LOG_LEVEL_DEBUG: buf.append("DEBUG"); break; - case LOG_LEVEL_INFO: buf.append("INFO"); break; - case LOG_LEVEL_WARN: buf.append("WARN"); break; - case LOG_LEVEL_ERROR: buf.append("ERROR"); break; -// case LOG_LEVEL_FATAL: buf.append("[FATAL] "); break; + switch (level) { + case LOG_LEVEL_TRACE: + buf.append("TRACE"); + break; + case LOG_LEVEL_DEBUG: + buf.append("DEBUG"); + break; + case LOG_LEVEL_INFO: + buf.append("INFO"); + break; + case LOG_LEVEL_WARN: + buf.append("WARN"); + break; + case LOG_LEVEL_ERROR: + buf.append("ERROR"); + break; } buf.append(' '); // Append the name of the log instance if so configured - if(showShortName) { - if(shortLogName==null) { - // Cut all but the last component of the name for both styles - shortLogName = name.substring(name.lastIndexOf(".") + 1); - shortLogName = - shortLogName.substring(shortLogName.lastIndexOf("/") + 1); - } + if (SHOW_SHORT_NAME) { + if (shortLogName == null) shortLogName = computeShortName(); buf.append(String.valueOf(shortLogName)).append(" - "); - } else if(showLogName) { - buf.append(String.valueOf(name)).append(" - "); + } else if (SHOW_LOG_NAME) { + buf.append(String.valueOf(name)).append(" - "); } // Append the message @@ -359,6 +385,19 @@ public class SimpleLogger extends MarkerIgnoringBase { System.err.flush(); } + private String getFormattedDate() { + Date now = new Date(); + String dateText; + synchronized (DATE_FORMATTER) { + dateText = DATE_FORMATTER.format(now); + } + return dateText; + } + + private String computeShortName() { + return name.substring(name.lastIndexOf(".") + 1); + } + /** * For formatted messages, first substitute arguments and then log. * @@ -368,8 +407,8 @@ public class SimpleLogger extends MarkerIgnoringBase { * @param arg2 */ private void formatAndLog(int level, String format, Object arg1, - Object arg2) { - if (! isLevelEnabled(level)) { + Object arg2) { + if (!isLevelEnabled(level)) { return; } FormattingTuple tp = MessageFormatter.format(format, arg1, arg2); @@ -384,7 +423,7 @@ public class SimpleLogger extends MarkerIgnoringBase { * @param arguments a list of 3 ore more arguments */ private void formatAndLog(int level, String format, Object... arguments) { - if (! isLevelEnabled(level)) { + if (!isLevelEnabled(level)) { return; } FormattingTuple tp = MessageFormatter.arrayFormat(format, arguments); @@ -397,12 +436,11 @@ public class SimpleLogger extends MarkerIgnoringBase { * @param logLevel is this level enabled? */ protected boolean isLevelEnabled(int logLevel) { - // log level are numerically ordered so can use simple numeric - // comparison - return (logLevel >= currentLogLevel); + // log level are numerically ordered so can use simple numeric + // comparison + return (logLevel >= currentLogLevel); } - /** * Are {@code trace} messages currently enabled? */ ----------------------------------------------------------------------- Summary of changes: .../src/main/java/org/slf4j/impl/SimpleLogger.java | 400 +++++++++++--------- 1 files changed, 219 insertions(+), 181 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java

1 0

[qos-ch/slf4j] e96e32: refactoring to improve readability
by Ceki Gulcu 14 Sep '12

14 Sep '12

Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: e96e3290507c8f8bf9f9c1f8811ca9e2f7ac4cd7 https://github.com/qos-ch/slf4j/commit/e96e3290507c8f8bf9f9c1f8811ca9e2f7ac… Author: Ceki Gulcu <ceki(a)qos.ch> Date: 2012-09-14 (Fri, 14 Sep 2012) Changed paths: M slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java Log Message: ----------- refactoring to improve readability

1 0

[GIT] SLF4J: Simple Logging Facade for Java branch master updated. v_1.7.0-4-gbeb834f
by git-noreply＠pixie.qos.ch 14 Sep '12

14 Sep '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via beb834f2cab2b4c2e5a4fb34410ca78284b6030c (commit) from 8fa7c51ce878fc8e166ea017c826f09cbe1cfc35 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=beb834f2cab2b4c2e5a4fb3441… http://github.com/ceki/slf4j/commit/beb834f2cab2b4c2e5a4fb34410ca78284b6030c commit beb834f2cab2b4c2e5a4fb34410ca78284b6030c Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Sep 14 17:28:52 2012 +0200 minor corrections diff --git a/slf4j-site/src/site/pages/codes.html b/slf4j-site/src/site/pages/codes.html index e01c22f..934fa9a 100644 --- a/slf4j-site/src/site/pages/codes.html +++ b/slf4j-site/src/site/pages/codes.html @@ -169,11 +169,12 @@ binding when declaring the unscrupulous dependency. For example, cassandra-all version 0.8.1 declares both log4j and slf4j-log4j12 as compile-time dependencies. Thus, - when you include cassandra-all a dependnecy in your - project, it will pulling in both slf4j-log4j12.jar and - log4j.jar as dependencies. In case you do not wish to use - log4j as the the SLF4J backend, you can instruct Maven to exclude - these two artifacts as shown next: + when you include cassandra-all as a dependency in your + project, the cassandra-all declaration will cause both + slf4j-log4j12.jar and log4j.jar to be pulled in + as dependencies. In case you do not wish to use log4j as the the + SLF4J backend, you can instruct Maven to exclude these two + artifacts as shown next: <pre class="prettyprint"><dependencies> <dependency> ----------------------------------------------------------------------- Summary of changes: slf4j-site/src/site/pages/codes.html | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java

1 0

[qos-ch/slf4j] beb834: minor corrections
by Ceki Gulcu 14 Sep '12

14 Sep '12

Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: beb834f2cab2b4c2e5a4fb34410ca78284b6030c https://github.com/qos-ch/slf4j/commit/beb834f2cab2b4c2e5a4fb34410ca78284b6… Author: Ceki Gulcu <ceki(a)qos.ch> Date: 2012-09-14 (Fri, 14 Sep 2012) Changed paths: M slf4j-site/src/site/pages/codes.html Log Message: ----------- minor corrections

1 0