- logback-dev - mailman3.qos.ch

[JIRA] Created: (LBCLASSIC-207) LoggingEventVO is using a simply toString during serialization, fumbling with arrays.
by Joern Huxhorn (JIRA) 06 May '10

06 May '10

LoggingEventVO is using a simply toString during serialization, fumbling with arrays. ------------------------------------------------------------------------------------- Key: LBCLASSIC-207 URL: http://jira.qos.ch/browse/LBCLASSIC-207 Project: logback-classic Issue Type: Bug Components: appender Affects Versions: 0.9.20 Reporter: Joern Huxhorn Assignee: Logback dev list Any array used as parameter shows up unreadable. It should instead use the same toString logic used by MessageFormatter. I'd have submitted a patch/branch for this issue but - unfortunately - SLF4J MessageFormatter does not have a method that's performing just the String conversion. Please see http://github.com/huxi/lilith/blob/master/lilith-data/logging/src/main/java… especially the method String deepToString(Object o) Because of this, a fix (providing and using said method) would span over both SLF4J and Logback. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 4

[JIRA] Created: (LBCLASSIC-206) ConditionalTest.conditionalConsoleApp_IF_THEN_True fails due to wrong way of creating the aHost property
by Robert Elliot (JIRA) 03 May '10

03 May '10

ConditionalTest.conditionalConsoleApp_IF_THEN_True fails due to wrong way of creating the aHost property -------------------------------------------------------------------------------------------------------- Key: LBCLASSIC-206 URL: http://jira.qos.ch/browse/LBCLASSIC-206 Project: logback-classic Issue Type: Bug Components: Other Affects Versions: 0.9.20 Environment: Mac OS/X 10.6, Java 1.6 64 bit Reporter: Robert Elliot Assignee: Logback dev list ConditionalTest.conditionalConsoleApp_IF_THEN_True fails on my machine because it constructs the local host in the test using InetAddress.getLocalHost().getCanonicalHostName() whereas ContextUtil uses InetAddress.getLocalHost().getLocalHost(). On my machine the canonical hostname call returns an ip address whereas the localhost call returns a hostname. As they do not match the test fails. Fixed on this branch http://github.com/Mahoney/logback/tree/mac-host-bug and pull request submitted. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

[JIRA] Created: (LBCLASSIC-189) Normalization of fields
by Ceki Gulcu (JIRA) 02 May '10

02 May '10

Normalization of fields ----------------------- Key: LBCLASSIC-189 URL: http://jira.qos.ch/browse/LBCLASSIC-189 Project: logback-classic Issue Type: Sub-task Reporter: Ceki Gulcu Assignee: Logback dev list Normalization of recurrent fields such as logger. Normalization of session data. The idea was originally proposed by Ruediger Dohna in http://jira.qos.ch/browse/LBCLASSIC-169?focusedCommentId=11570#action_11570. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 2

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.20-11-gad6b18f
by git-noreply＠pixie.qos.ch 27 Apr '10

27 Apr '10

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 "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via ad6b18f0229d4d221e284d0176484a52f9f00f49 (commit) from 62ef3635ed5d87c13286e710e0b1f3c6f327a1a6 (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=logback.git;a=commit;h=ad6b18f0229d4d221e284d01… http://github.com/ceki/logback/commit/ad6b18f0229d4d221e284d0176484a52f9f00… commit ad6b18f0229d4d221e284d0176484a52f9f00f49 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Apr 27 18:29:34 2010 +0200 news update diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 6cc2626..70d1eed 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -26,6 +26,18 @@ the <a href="http://www.qos.ch/mailman/listinfo/announce">QOS.ch announce</a> mailing list.</p> + <hr width="80%" align="center" /> + + <h3>April xx, 2010 - Release of version 0.9.21</h3> + + <p>SLF4J dependency upgraded to 1.6.0-RC0.</p> + + <p>Fixed concurrency problem in <code>SiftingAppender</code> as + reported in <a + href="http://jira.qos.ch/browse/LBCLASSIC-203">LBCLASSIC-203</a> + by Ellen Strnod. + </p> + <hr width="80%" align="center" /> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/news.html | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-205) DBAppender logs sensitive properties to the database when using property substitution in the configuration file
by Chris Pruett (JIRA) 27 Apr '10

27 Apr '10

DBAppender logs sensitive properties to the database when using property substitution in the configuration file --------------------------------------------------------------------------------------------------------------- Key: LBCLASSIC-205 URL: http://jira.qos.ch/browse/LBCLASSIC-205 Project: logback-classic Issue Type: Bug Components: appender Affects Versions: 0.9.20 Reporter: Chris Pruett Assignee: Logback dev list Logback's DBAppender logs all properties in its context and MDC to the database. I would like to control which properties are logged, specifically filtering out certain values, but I can't find any options to do so. The documentation is terse: The logging_event_property is used to store the keys and values contained in the MDC or the Context It should be possible to exclude certain properties, especially sensitive properties such as database connection parameters. Here is an example: Logback is configured with a DBAppender that loads its properties from vct.properties: <configuration> <property resource="vct.properties" /> <appender name="DB" class="ch.qos.logback.classic.db.DBAppender"> <connectionSource class="ch.qos.logback.core.db.DataSourceConnectionSource"> <dataSource class="com.mchange.v2.c3p0.ComboPooledDataSource"> <driverClass>com.mysql.jdbc.Driver</driverClass> <jdbcUrl>jdbc:mysql://${log.db.host}:${log.db.port}/${log.db.schema}</jdbcUrl> <user>${log.db.username}</user> <password>${log.db.password}</password> </dataSource> </connectionSource> </appender> <root level="DEBUG"> <appender-ref ref="DB" /> </root> </configuration> vct.properties has the connection settings: log.db.host=localhost log.db.port=3306 log.db.schema=logs_development log.db.username=loguser log.db.password=logpass When an event is logged, all of the connection settings are logged: mysql> select * from logging_event_property where event_id=1; +----------+---------------------+-------------------------------------------+ | event_id | mapped_key | mapped_value | +----------+---------------------+-------------------------------------------+ | 1 | log.db.host | localhost | | 1 | log.db.password | logpass | | 1 | log.db.port | 3306 | | 1 | log.db.schema | logs_development | | 1 | log.db.username | loguser | +----------+---------------------+-------------------------------------------+ Note that this is also documented on Stack Overflow, and logged as a bug per Ceki's request: http://stackoverflow.com/questions/2648267/can-i-prevent-logbacks-dbappende… -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 1

Release of SLF4J version 1.6.0-alpha2
by Ceki Gülcü 26 Apr '10

26 Apr '10

Hello all, I am happy to announce the immediate availability of SLF4J version 1.6.0-alpha2, which is still experimental, consisting of several important enhancements and bug fixes. In the 1.6.x series, in the absence of an SLF4J binding, slf4j-api will default to a no-operation implementation discarding all log requests. Thus, instead of throwing an exception, SLF4J will emit a single warning message about the absence of a binding and proceed to discard all log requests without further protest. Please refer to the the news page for precise details. http://www.slf4j.org/news.html You can download SLF4J, including full source code, class files and documentation on our download page, shown below. http://www.slf4j.org/download.html You can receive SLF4J related announcements by subscribing to the SLF4J announce mailing list. To subscribe to QOS.ch announce list, please visit the following URL. http://qos.ch/mailman/listinfo/announce -- Ceki Gülcü Logback: The reliable, fast and flexible logging framework for Java. http://logback.qos.ch

1 0

[JIRA] Created: (LBCLASSIC-203) simultaneously logging to all historical logs after rollover
by Ellen Strnod (JIRA) 23 Apr '10

23 Apr '10

simultaneously logging to all historical logs after rollover ------------------------------------------------------------ Key: LBCLASSIC-203 URL: http://jira.qos.ch/browse/LBCLASSIC-203 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.18, 0.9.20 Environment: Windows XP, Windows 7; jdk1.6.0_16 Reporter: Ellen Strnod Assignee: Logback dev list Logs will roll over (using sifted rolling file appender) and then start logging simultaneously to all the historical log files for that application (log_1.log, log_2.log, etc.) as well as the current one (log.log). Once this happens, application performance is severely degraded. I made a test app using first the same versions of logback & slf4j as used by dm server 2.0, where the problem was first witnessed. (logback 0.9.18, slf4j api 1.5.10). It seems to continue to work fine as long as only one thread is logging. 5 threads, and it will happen occasionally/eventually. 10 threads, and it is pretty likely to happen as soon as it rolls over the first time. I then updated it to use current versions (logback 0.9.20, slf4j api 1.5.11), and witnessed the same behavior. I have a release zip I can provide if possible (not sure attachments are allowed with JIRA); otherwise, here are contents of project files for the test case: -------------------------------------------------------------- logback.xml contents: --------------------------------------------------------------- <configuration>  <appender name="SIFTED_LOG_FILE" class="ch.qos.logback.classic.sift.SiftingAppender"> <discriminator> <Key>applicationName</Key> <DefaultValue>default</DefaultValue> </discriminator> <sift> <appender name="${applicationName}_LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>../logs/${applicationName}/log.log </file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> <FileNamePattern>../logs/${applicationName}/log_%i.log </FileNamePattern> <MinIndex>1</MinIndex> <MaxIndex>4</MaxIndex> </rollingPolicy> <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <MaxFileSize>10MB</MaxFileSize> </triggeringPolicy> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}|%t|%p|%c{35}.%M:%L|%msg %ex%n</Pattern> </layout> </appender> </sift> </appender> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}|%t|%p|%c{35}.%M:%L|%msg %ex%n</Pattern> </layout> </appender> <logger level="trace" additivity="false" name="Standard.out"> <appender-ref ref="STDOUT" /> </logger> <logger level="trace" additivity="false" name="com.annealsoft"> <appender-ref ref="SIFTED_LOG_FILE" /> </logger> <root level="info" additivity="false"> <appender-ref ref="SIFTED_LOG_FILE" /> </root> </configuration> ---------------------------------------------------------------- Java test app LogbackRolloverTest.java: ------------------------------------------------------------------- package com.annealsoft.test; import java.util.Date; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class LogbackRolloverTest extends Thread { private static Logger log = LoggerFactory.getLogger(LogbackRolloverTest.class); private static final int DEFAULT_THREAD_COUNT = 10; private static int threadcount = 10; public static void main(String[] args){ if (args.length > 0) { try { threadcount = Integer.parseInt(args[0]); } catch (Exception e){ System.out.println("Usage: LogbackRolloverTest [<thread count>] (defaults to " + DEFAULT_THREAD_COUNT + " threads)"); System.exit(1); } } System.out.println("Logging from " + threadcount + (threadcount == 1 ? " thread":" threads") + " (optional thread count parameter defaults to " + DEFAULT_THREAD_COUNT + ")"); for (int i = 0; i < threadcount; i++) { new LogbackRolloverTest().start(); } } public void run() { int count = 0; while (true) { doLog(count++); } } private void doLog(int count) { log.debug("The current date is " + new Date() + " the count is " + count); log.info("Info Message"); log.warn("Warn Message"); log.trace("Trace message"); log.error("Error message"); log.info("Info Message"); log.warn("Warn Message"); log.trace("Trace message"); log.error("Error message"); try { throw new Exception("throwing exception " + count + " to create a stack trace"); } catch (Exception e) { log.error("caught " + e.toString(), e); } if (count % 10 == 0) { try { Thread.sleep(100); } catch (InterruptedException e) { log.error("Thread interrupted: " + e.toString(), e); } } } } ------------------------------------------------------------- Batch file contents logbacktest.bat: ------------------------------------------------------------- @ECHO OFF IF "%OS%" == "Windows_NT" SETLOCAL IF NOT "%JAVA_HOME%" == "" goto JavaHomeSet echo The JAVA_HOME environment variable is not defined GOTO:EOF :JavaHomeSet SET SCRIPT_DIR=%~dp0% SET APP_HOME="%SCRIPT_DIR%.." setlocal ENABLEDELAYEDEXPANSION if defined LOCAL_CLASSPATH (set LOCAL_CLASSPATH=%LOCAL_CLASSPATH%;.) else (set LOCAL_CLASSPATH=.) FOR /R ..\lib %%G IN (*.jar) DO set LOCAL_CLASSPATH=!LOCAL_CLASSPATH!;%%G Echo The Classpath definition is %LOCAL_CLASSPATH% "%JAVA_HOME%"\bin\java -Dhomedir="%APP_HOME%" -classpath "%LOCAL_CLASSPATH%" com.annealsoft.test.LogbackRolloverTest %1 ------------------------------------------------------------------ Maven pom.xml: ------------------------------------------------------------------ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.annealsoft</groupId> <artifactId>logback-test</artifactId> <packaging>jar</packaging> <version>${release-version}</version> <name>logback-test</name> <repositories> </repositories> <dependencies> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <version>${logback}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j-api}</version> </dependency> </dependencies> <profiles> <profile> <id>logback-test</id> <activation> <activeByDefault>true</activeByDefault> </activation> <properties> <JDK_VERSION>1.6</JDK_VERSION> <release-version>1.0</release-version>   <logback>0.9.20</logback> <slf4j-api>1.5.11</slf4j-api> </properties> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins </groupId> <artifactId>maven-compiler-plugin </artifactId> <configuration> <source>${JDK_VERSION}</source> <target>${JDK_VERSION}</target> </configuration> </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptor>release.xml</descriptor> <outputDirectory>release</outputDirectory> </configuration> </plugin> </plugins> <finalName>logback-test</finalName> <defaultGoal>package</defaultGoal> </build> </profile> </profiles> </project> -------------------------------------------------------------------------- Maven release.xml: -------------------------------------------------------------------------- <assembly> <id>${release-version}</id> <formats> <format>zip</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> <fileSets> <fileSet> <directory>bin</directory> <outputDirectory>bin</outputDirectory> </fileSet> <fileSet> <directory>lib</directory> <outputDirectory>lib</outputDirectory> </fileSet> <fileSet> <directory>src</directory> <outputDirectory>src</outputDirectory> </fileSet> <fileSet> <directory>src/main/resources</directory> <outputDirectory>config</outputDirectory> </fileSet> <fileSet> <directory>logs</directory> <outputDirectory>logs</outputDirectory> </fileSet> </fileSets> <dependencySets> <dependencySet> <unpack>false</unpack> <scope>runtime</scope> <outputDirectory>lib</outputDirectory> </dependencySet> </dependencySets> </assembly> -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 5

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.20-10-g62ef363
by git-noreply＠pixie.qos.ch 23 Apr '10

23 Apr '10

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 "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 62ef3635ed5d87c13286e710e0b1f3c6f327a1a6 (commit) from 11ae2ad01ed9cc2f084b9b2c28a2c24c5faaf77b (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=logback.git;a=commit;h=62ef3635ed5d87c13286e710… http://github.com/ceki/logback/commit/62ef3635ed5d87c13286e710e0b1f3c6f327a… commit 62ef3635ed5d87c13286e710e0b1f3c6f327a1a6 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Apr 23 17:28:00 2010 +0200 - upgrade to SLF4J 1.6.0-RC0 Logger class changed to comply with changes in LoggingLocationAware interface LoggingEvent changeed to comply with changes in MessgageFormatter LoggingEventVO changeed to comply with changes in MessgageFormatter - test cases related to http://jira.qos.ch/browse/LBCLASSIC-203 diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 40954d4..032c8c9 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -264,7 +264,7 @@ <exclude>**/TestConstants.java</exclude> <exclude>**/test_osgi/BundleTest.java</exclude> org.slf4j.test_osgi - <exclude>**/SerializationPerfsTest.java</exclude> + <exclude>**/SerializationPerfTest.java</exclude> </excludes> </configuration> </plugin> diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java b/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java index 0d2957f..67c7b43 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java @@ -80,12 +80,18 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, * synchronized on 'this' (Logger) protecting against simultaneous * re-configuration of this logger (a very unlikely scenario). * - * <p> It is further assumed that the AppenderAttachableImpl is responsible - * for its internal synchronization and thread safety. Thus, we can get away - * with *not* synchronizing on the 'aai' (check null/ read) because <p> 1) the - * 'aai' variable is immutable once set to non-null <p> 2) 'aai' is getAndSet - * only within addAppender which is synchronized <p> 3) all the other methods - * check whether 'aai' is null <p> 4) AppenderAttachableImpl is thread safe + * <p> + * It is further assumed that the AppenderAttachableImpl is responsible for + * its internal synchronization and thread safety. Thus, we can get away with + * *not* synchronizing on the 'aai' (check null/ read) because + * <p> + * 1) the 'aai' variable is immutable once set to non-null + * <p> + * 2) 'aai' is getAndSet only within addAppender which is synchronized + * <p> + * 3) all the other methods check whether 'aai' is null + * <p> + * 4) AppenderAttachableImpl is thread safe */ private transient AppenderAttachableImpl<ILoggingEvent> aai; /** @@ -158,17 +164,18 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, // nothing to do; return; } - if(newLevel == null && isRootLogger()) { - throw new IllegalArgumentException("The level of the root logger cannot be set to null"); + if (newLevel == null && isRootLogger()) { + throw new IllegalArgumentException( + "The level of the root logger cannot be set to null"); } - + level = newLevel; if (newLevel == null) { effectiveLevelInt = parent.effectiveLevelInt; } else { effectiveLevelInt = newLevel.levelInt; } - + if (childrenList != null) { int len = childrenList.size(); for (int i = 0; i < len; i++) { @@ -203,8 +210,9 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, } /** - * Remove all previously added appenders from this logger instance. <p/> This - * is useful when re-reading configuration information. + * Remove all previously added appenders from this logger instance. + * <p/> + * This is useful when re-reading configuration information. */ public void detachAndStopAllAppenders() { if (aai != null) { @@ -254,7 +262,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, * Invoke all the appenders of this logger. * * @param event - * The event to log + * The event to log */ public void callAppenders(ILoggingEvent event) { int writes = 0; @@ -291,7 +299,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, static int getSeparatorIndexOf(String name) { return getSeparatorIndexOf(name, 0); } - + /** * Get the position of the separator character, if any, starting at position * 'fromIndex'. @@ -300,35 +308,35 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, * @param fromIndex * @return */ - static int getSeparatorIndexOf(String name, int fromIndex) { + static int getSeparatorIndexOf(String name, int fromIndex) { int i = name.indexOf(CoreConstants.DOT, fromIndex); - if(i != -1) { + if (i != -1) { return i; } else { return name.indexOf(CoreConstants.DOLLAR, fromIndex); } } - + /** * Create a child of this logger by suffix, that is, the part of the name * extending this logger. For example, if this logger is named "x.y" and the * lastPart is "z", then the created child logger will be named "x.y.z". * - * <p> IMPORTANT: Calls to this method must be within a synchronized block on - * this logger. + * <p> + * IMPORTANT: Calls to this method must be within a synchronized block on this + * logger. * * @param lastPart - * the suffix (i.e. last part) of the child logger name. This - * parameter may not include dots, i.e. the logger separator - * character. + * the suffix (i.e. last part) of the child logger name. This + * parameter may not include dots, i.e. the logger separator + * character. * @return */ Logger createChildByLastNamePart(final String lastPart) { int i_index = getSeparatorIndexOf(lastPart); if (i_index != -1) { throw new IllegalArgumentException("Child name [" + lastPart - + " passed as parameter, may not include [" - + CoreConstants.DOT + "]"); + + " passed as parameter, may not include [" + CoreConstants.DOT + "]"); } if (childrenList == null) { @@ -338,8 +346,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, if (this.isRootLogger()) { childLogger = new Logger(lastPart, this, this.loggerContext); } else { - childLogger = new Logger( - name + CoreConstants.DOT + lastPart, this, + childLogger = new Logger(name + CoreConstants.DOT + lastPart, this, this.loggerContext); } childrenList.add(childLogger); @@ -349,13 +356,13 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, private void localLevelReset() { effectiveLevelInt = Level.DEBUG_INT; - if(isRootLogger()) { + if (isRootLogger()) { level = Level.DEBUG; } else { level = null; } } - + void recursiveReset() { detachAndStopAllAppenders(); localLevelReset(); @@ -375,8 +382,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, static private final int DEFAULT_CHILD_ARRAY_SIZE = 5; Logger createChildByName(final String childName) { - int i_index = getSeparatorIndexOf(childName, this.name - .length() + 1); + int i_index = getSeparatorIndexOf(childName, this.name.length() + 1); if (i_index != -1) { throw new IllegalArgumentException("For logger [" + this.name + "] child name [" + childName @@ -814,7 +820,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, } public void log(Marker marker, String fqcn, int levelInt, String message, - Throwable t) { + Object[] argArray, Throwable t) { Level level = null; switch (levelInt) { case LocationAwareLogger.TRACE_INT: @@ -835,7 +841,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, default: throw new IllegalArgumentException(levelInt + " not a valid level value"); } - filterAndLog_0_Or3Plus(fqcn, marker, level, message, null, t); + filterAndLog_0_Or3Plus(fqcn, marker, level, message, argArray, t); } /** diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java index 867c9d2..774c5fd 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java @@ -18,6 +18,7 @@ import java.util.Map; import org.slf4j.MDC; import org.slf4j.Marker; +import org.slf4j.helpers.FormattingTuple; import org.slf4j.helpers.MessageFormatter; import ch.qos.logback.classic.Level; @@ -30,11 +31,13 @@ import ch.qos.logback.classic.util.LogbackMDCAdapter; * is made to log then a <code>LoggingEvent</code> instance is created. This * instance is passed around to the different logback-classic components. * - * <p> Writers of logback-classic components such as appenders should be aware - * of that some of the LoggingEvent fields are initialized lazily. Therefore, an + * <p> + * Writers of logback-classic components such as appenders should be aware of + * that some of the LoggingEvent fields are initialized lazily. Therefore, an * appender wishing to output data to be later correctly read by a receiver, * must initialize "lazy" fields prior to writing them out. See the - * {@link #prepareForDeferredProcessing()} method for the exact list. </p> + * {@link #prepareForDeferredProcessing()} method for the exact list. + * </p> * * @author Ceki Gülcü * @author Sébastien Pennec @@ -45,7 +48,8 @@ public class LoggingEvent implements ILoggingEvent { * Fully qualified name of the calling Logger class. This field does not * survive serialization. * - * <p> Note that the getCallerInformation() method relies on this fact. + * <p> + * Note that the getCallerInformation() method relies on this fact. */ transient String fqnOfLoggerClass; @@ -61,8 +65,10 @@ public class LoggingEvent implements ILoggingEvent { /** * Level of logging event. * - * <p> This field should not be accessed directly. You shoud use the {@link - * #getLevel} method instead. </p> + * <p> + * This field should not be accessed directly. You shoud use the + * {@link #getLevel} method instead. + * </p> * */ private transient Level level; @@ -103,6 +109,16 @@ public class LoggingEvent implements ILoggingEvent { this.message = message; + FormattingTuple ft = MessageFormatter.arrayFormat(message, argArray); + formattedMessage = ft.getMessage(); + + if (throwable == null) { + argumentArray = ft.getArgArray(); + throwable = ft.getThrowable(); + } else { + this.argumentArray = argArray; + } + if (throwable != null) { this.throwableProxy = new ThrowableProxy(throwable); LoggerContext lc = logger.getLoggerContext(); @@ -111,12 +127,9 @@ public class LoggingEvent implements ILoggingEvent { } } - // bug 85 (we previously failed to set this.argumentArray) - this.argumentArray = argArray; - timeStamp = System.currentTimeMillis(); - // the case is ugly but under the circumstances acceptable + // ugly but under the circumstances acceptable LogbackMDCAdapter logbackMDCAdapter = (LogbackMDCAdapter) MDC .getMDCAdapter(); mdcPropertyMap = logbackMDCAdapter.getPropertyMap(); @@ -154,9 +167,9 @@ public class LoggingEvent implements ILoggingEvent { /** * @param threadName - * The threadName to set. + * The threadName to set. * @throws IllegalStateException - * If threadName has been already set. + * If threadName has been already set. */ public void setThreadName(String threadName) throws IllegalStateException { if (this.threadName != null) { @@ -188,9 +201,9 @@ public class LoggingEvent implements ILoggingEvent { * This method should be called prior to serializing an event. It should also * be called when using asynchronous or deferred logging. * - * <p> Note that due to performance concerns, this method does NOT extract - * caller data. It is the responsibility of the caller to extract caller - * information. + * <p> + * Note that due to performance concerns, this method does NOT extract caller + * data. It is the responsibility of the caller to extract caller information. */ public void prepareForDeferredProcessing() { this.getFormattedMessage(); @@ -242,8 +255,10 @@ public class LoggingEvent implements ILoggingEvent { * null at the time of its invocation, this method extracts location * information. The collected information is cached for future use. * - * <p> Note that after serialization it is impossible to correctly extract - * caller information. </p> + * <p> + * Note that after serialization it is impossible to correctly extract caller + * information. + * </p> */ public StackTraceElement[] getCallerData() { if (callerDataArray == null) { @@ -283,9 +298,9 @@ public class LoggingEvent implements ILoggingEvent { if (formattedMessage != null) { return formattedMessage; } - if (argumentArray != null) { - formattedMessage = MessageFormatter.arrayFormat(message, argumentArray); + formattedMessage = MessageFormatter.arrayFormat(message, argumentArray) + .getMessage(); } else { formattedMessage = message; } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEventVO.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEventVO.java index 32c5708..c55b281 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEventVO.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEventVO.java @@ -73,7 +73,7 @@ public class LoggingEventVO implements ILoggingEvent, Serializable { ledo.throwableProxy = ThrowableProxyVO.build(le.getThrowableProxy()); // add caller data only if it is there already // fixes http://jira.qos.ch/browse/LBCLASSIC-145 - if(le.hasCallerData()) { + if (le.hasCallerData()) { ledo.callerDataArray = le.getCallerData(); } return ledo; @@ -105,7 +105,8 @@ public class LoggingEventVO implements ILoggingEvent, Serializable { } if (argumentArray != null) { - formattedMessage = MessageFormatter.arrayFormat(message, argumentArray); + formattedMessage = MessageFormatter.arrayFormat(message, argumentArray) + .getMessage(); } else { formattedMessage = message; } @@ -137,8 +138,6 @@ public class LoggingEventVO implements ILoggingEvent, Serializable { return timeStamp; } - - public long getContextBirthTime() { return loggerContextVO.getBirthTime(); } diff --git a/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index c0ef94f..9e6ee66 100644 --- a/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -30,7 +30,8 @@ import ch.qos.logback.core.util.StatusPrinter; * The binding of {@link LoggerFactory} class with an actual instance of * {@link ILoggerFactory} is performed using information returned by this class. * - * @author <a href="http://www.qos.ch/shop/products/log4jManual">Ceki Gülcü</a> + * @author <a href="http://www.qos.ch/shop/products/log4jManual">Ceki + * Gülcü</a> */ public class StaticLoggerBinder implements LoggerFactoryBinder { @@ -56,8 +57,9 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { private boolean initialized = false; private LoggerContext defaultLoggerContext = new LoggerContext(); - private final ContextSelectorStaticBinder contextSelectorBinder = ContextSelectorStaticBinder.getSingleton(); - + private final ContextSelectorStaticBinder contextSelectorBinder = ContextSelectorStaticBinder + .getSingleton(); + private StaticLoggerBinder() { defaultLoggerContext.setName(CoreConstants.DEFAULT_CONTEXT_NAME); } @@ -82,21 +84,18 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { try { new ContextInitializer(defaultLoggerContext).autoConfig(); } catch (JoranException je) { - Util.reportFailure("Failed to auto configure default logger context", - je); + Util.report("Failed to auto configure default logger context", je); } StatusPrinter.printInCaseOfErrorsOrWarnings(defaultLoggerContext); contextSelectorBinder.init(defaultLoggerContext, KEY); initialized = true; } catch (Throwable t) { // we should never get here - Util.reportFailure("Failed to instantiate [" - + LoggerContext.class.getName() + "]", t); + Util.report("Failed to instantiate [" + LoggerContext.class.getName() + + "]", t); } } - - public ILoggerFactory getLoggerFactory() { if (!initialized) { return defaultLoggerContext; @@ -113,5 +112,4 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { return contextSelectorBinder.getContextSelector().getClass().getName(); } - } diff --git a/logback-classic/src/test/input/joran/sift/lbclassic203.xml b/logback-classic/src/test/input/joran/sift/lbclassic203.xml new file mode 100644 index 0000000..5db0eb8 --- /dev/null +++ b/logback-classic/src/test/input/joran/sift/lbclassic203.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration debug="true"> + + <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" /> + + + <appender name="SIFT" class="ch.qos.logback.classic.sift.SiftingAppender"> + + <discriminator> + <Key>userid</Key> + <defaultValue>smoke</defaultValue> + </discriminator> + <sift> + <appender name="list-${userid}" + class="ch.qos.logback.classic.issue.lbclassic203.InstanceCountingAppender" /> + </sift> + </appender> + + <root level="DEBUG"> + <appender-ref ref="SIFT" /> + </root> + +</configuration> diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java index f23dae9..2e79ccd 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java @@ -20,6 +20,8 @@ import org.junit.runners.Suite.SuiteClasses; import ch.qos.logback.classic.issue.lbclassic135.lbclassic139.LB139_DeadlockTest; @RunWith(Suite.class) -(a)SuiteClasses(LB139_DeadlockTest.class) +@SuiteClasses( { LB139_DeadlockTest.class, + ch.qos.logback.classic.issue.lbclassic135.lbclassic139.PackageTest.class, + ch.qos.logback.classic.issue.lbclassic203.PackageTest.class }) public class PackageTest { } \ No newline at end of file diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/lbclassic139/PackageTest.java similarity index 84% copy from logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java copy to logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/lbclassic139/PackageTest.java index f23dae9..23c6d27 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/lbclassic139/PackageTest.java @@ -11,14 +11,12 @@ * under the terms of the GNU Lesser General Public License version 2.1 * as published by the Free Software Foundation. */ -package ch.qos.logback.classic.issue; +package ch.qos.logback.classic.issue.lbclassic135.lbclassic139; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import ch.qos.logback.classic.issue.lbclassic135.lbclassic139.LB139_DeadlockTest; - @RunWith(Suite.class) @SuiteClasses(LB139_DeadlockTest.class) public class PackageTest { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic154/LoggingAppender.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic154/LoggingAppender.java index a95b2b5..4c69bb9 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic154/LoggingAppender.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic154/LoggingAppender.java @@ -20,7 +20,6 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.AppenderBase; /** - * * An appender which calls logback recursively * * @author Ralph Goers diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/ConcurrentSiftingTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/ConcurrentSiftingTest.java index 0400413..4f67321 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/ConcurrentSiftingTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/ConcurrentSiftingTest.java @@ -13,13 +13,52 @@ */ package ch.qos.logback.classic.issue.lbclassic203; +import static org.junit.Assert.assertEquals; + import org.junit.Test; +import ch.qos.logback.classic.ClassicTestConstants; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.issue.lbclassic135.LoggingRunnable; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.contention.MultiThreadedHarness; +import ch.qos.logback.core.contention.RunnableWithCounterAndDone; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.status.StatusChecker; public class ConcurrentSiftingTest { - + final static int THREAD_COUNT = 5; + static String FOLDER_PREFIX = ClassicTestConstants.JORAN_INPUT_PREFIX + + "sift/"; + + LoggerContext loggerContext = new LoggerContext(); + protected Logger logger = loggerContext.getLogger(this.getClass().getName()); + protected Logger root = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME); + StatusChecker sc = new StatusChecker(loggerContext); + + int totalTestDuration = 50; + MultiThreadedHarness harness = new MultiThreadedHarness(totalTestDuration); + RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(); + + protected void configure(String file) throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(loggerContext); + jc.doConfigure(file); + } + + RunnableWithCounterAndDone[] buildRunnableArray() { + RunnableWithCounterAndDone[] rArray = new RunnableWithCounterAndDone[THREAD_COUNT]; + for (int i = 0; i < THREAD_COUNT; i++) { + rArray[i] = new LoggingRunnable(logger); + } + return rArray; + } + @Test - public void test() { - throw new IllegalStateException(""); + public void concurrentAccess() throws JoranException, InterruptedException { + configure(FOLDER_PREFIX + "lbclassic203.xml"); + harness.execute(runnableArray); + assertEquals(1, InstanceCountingAppender.INSTANCE_COUNT); } } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/ConcurrentSiftingTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/InstanceCountingAppender.java similarity index 62% copy from logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/ConcurrentSiftingTest.java copy to logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/InstanceCountingAppender.java index 0400413..34e8133 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/ConcurrentSiftingTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/InstanceCountingAppender.java @@ -13,13 +13,18 @@ */ package ch.qos.logback.classic.issue.lbclassic203; -import org.junit.Test; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.AppenderBase; - -public class ConcurrentSiftingTest { +public class InstanceCountingAppender extends AppenderBase<ILoggingEvent> { - @Test - public void test() { - throw new IllegalStateException(""); + static public volatile int INSTANCE_COUNT = 0; + + public InstanceCountingAppender() { + INSTANCE_COUNT++; } + + protected void append(ILoggingEvent e) { + } + } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/LogbackRolloverTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/LogbackRolloverTest.java deleted file mode 100644 index cc5f86f..0000000 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/LogbackRolloverTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package ch.qos.logback.classic.issue.lbclassic203; - -import java.util.Date; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class LogbackRolloverTest extends Thread { - private static Logger log = LoggerFactory - .getLogger(LogbackRolloverTest.class); - private static final int DEFAULT_THREAD_COUNT = 2; - private static int threadcount = DEFAULT_THREAD_COUNT; - - public static void main(String[] args) { - if (args.length > 0) { - try { - threadcount = Integer.parseInt(args[0]); - } catch (Exception e) { - System.out - .println("Usage: LogbackRolloverTest [<thread count>] (defaults to " - + DEFAULT_THREAD_COUNT + " threads)"); - System.exit(1); - } - } - System.out.println("Logging from " + threadcount - + (threadcount == 1 ? " thread" : " threads") - + " (optional thread count parameter defaults to " - + DEFAULT_THREAD_COUNT + ")"); - - for (int i = 0; i < threadcount; i++) { - new LogbackRolloverTest().start(); - } - } - - public void run() { - int count = 0; - while (true) { - doLog(count++); - } - } - - private void doLog(int count) { - log.debug("The current date is " + new Date() + " the count is " + count); - log.info("Info Message"); - log.warn("Warn Message"); - log.trace("Trace message"); - log.error("Error message"); - log.info("Info Message"); - log.warn("Warn Message"); - log.trace("Trace message"); - log.error("Error message"); - try { - throw new Exception("throwing exception " + count - + " to create a stack trace"); - } catch (Exception e) { - log.error("caught " + e.toString(), e); - } - if (count % 10 == 0) { - try { - Thread.sleep(500); - } catch (InterruptedException e) { - log.error("Thread interrupted: " + e.toString(), e); - } - } - - } -} diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/PackageTest.java similarity index 79% copy from logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java copy to logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/PackageTest.java index f23dae9..b009ca6 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/PackageTest.java @@ -11,15 +11,13 @@ * under the terms of the GNU Lesser General Public License version 2.1 * as published by the Free Software Foundation. */ -package ch.qos.logback.classic.issue; +package ch.qos.logback.classic.issue.lbclassic203; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import ch.qos.logback.classic.issue.lbclassic135.lbclassic139.LB139_DeadlockTest; - @RunWith(Suite.class) -(a)SuiteClasses(LB139_DeadlockTest.class) +(a)SuiteClasses(ConcurrentSiftingTest.class) public class PackageTest { } \ No newline at end of file diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/sift/SiftingAppenderTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/sift/SiftingAppenderTest.java index 1d05659..0b72c21 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/sift/SiftingAppenderTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/sift/SiftingAppenderTest.java @@ -1,6 +1,6 @@ /** * Logback: the reliable, generic, fast and flexible logging framework. - * Copyright (C) 1999-2009, QOS.ch. All rights reserved. + * Copyright (C) 1999-2010, QOS.ch. All rights reserved. * * This program and the accompanying materials are dual-licensed under * either the terms of the Eclipse Public License v1.0 as published by @@ -41,14 +41,14 @@ import ch.qos.logback.core.util.StatusPrinter; public class SiftingAppenderTest { - static String PREFIX = ClassicTestConstants.JORAN_INPUT_PREFIX + "sift/"; + static String SIFT_FOLDER_PREFIX = ClassicTestConstants.JORAN_INPUT_PREFIX + "sift/"; LoggerContext loggerContext = new LoggerContext(); Logger logger = loggerContext.getLogger(this.getClass().getName()); Logger root = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME); StatusChecker sc = new StatusChecker(loggerContext); - void configure(String file) throws JoranException { + protected void configure(String file) throws JoranException { JoranConfigurator jc = new JoranConfigurator(); jc.setContext(loggerContext); jc.doConfigure(file); @@ -56,7 +56,7 @@ public class SiftingAppenderTest { @Test public void unsetDefaultValueProperty() throws JoranException { - configure(PREFIX + "unsetDefaultValueProperty.xml"); + configure(SIFT_FOLDER_PREFIX + "unsetDefaultValueProperty.xml"); logger.debug("hello"); SiftingAppender sa = (SiftingAppender) root.getAppender("SIFT"); assertFalse(sa.isStarted()); @@ -64,7 +64,7 @@ public class SiftingAppenderTest { @Test public void smoke() throws JoranException { - configure(PREFIX + "smoke.xml"); + configure(SIFT_FOLDER_PREFIX + "smoke.xml"); logger.debug("smoke"); long timestamp = 0; SiftingAppender ha = (SiftingAppender) root.getAppender("SIFT"); @@ -78,7 +78,7 @@ public class SiftingAppenderTest { @Test public void zeroNesting() throws JoranException { - configure(PREFIX + "zeroNesting.xml"); + configure(SIFT_FOLDER_PREFIX + "zeroNesting.xml"); logger.debug("hello"); logger.debug("hello"); logger.debug("hello"); @@ -100,7 +100,7 @@ public class SiftingAppenderTest { @Test public void multipleNesting() throws JoranException { - configure(PREFIX + "multipleNesting.xml"); + configure(SIFT_FOLDER_PREFIX + "multipleNesting.xml"); logger.debug("hello"); logger.debug("hello"); logger.debug("hello"); @@ -119,7 +119,7 @@ public class SiftingAppenderTest { @Test public void defaultLayoutRule() throws JoranException { - configure(PREFIX + "defaultLayoutRule.xml"); + configure(SIFT_FOLDER_PREFIX + "defaultLayoutRule.xml"); logger.debug("hello"); long timestamp = 0; SiftingAppender ha = (SiftingAppender) root.getAppender("SIFT"); @@ -135,7 +135,7 @@ public class SiftingAppenderTest { @Test public void testWholeCycle() throws JoranException { String mdcKey = "cycle"; - configure(PREFIX + "completeCycle.xml"); + configure(SIFT_FOLDER_PREFIX + "completeCycle.xml"); MDC.put(mdcKey, "a"); logger.debug("smoke"); long timestamp = System.currentTimeMillis(); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/spi/PubLoggingEventVO.java b/logback-classic/src/test/java/ch/qos/logback/classic/spi/PubLoggingEventVO.java index 9946aab..68d17e3 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/spi/PubLoggingEventVO.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/spi/PubLoggingEventVO.java @@ -28,11 +28,9 @@ import ch.qos.logback.classic.Level; * A read/write and serializable implementation of {@link ILoggingEvent}. * * @author Ceki Gülcü - */ public class PubLoggingEventVO implements ILoggingEvent, Serializable { - private static final long serialVersionUID = -3385765861078946218L; private static final int NULL_ARGUMENT_ARRAY = -1; @@ -55,8 +53,6 @@ public class PubLoggingEventVO implements ILoggingEvent, Serializable { public Map<String, String> mdcPropertyMap; public long timeStamp; - - public String getThreadName() { return threadName; } @@ -83,7 +79,8 @@ public class PubLoggingEventVO implements ILoggingEvent, Serializable { } if (argumentArray != null) { - formattedMessage = MessageFormatter.arrayFormat(message, argumentArray); + formattedMessage = MessageFormatter.arrayFormat(message, argumentArray) + .getMessage(); } else { formattedMessage = message; } @@ -115,8 +112,6 @@ public class PubLoggingEventVO implements ILoggingEvent, Serializable { return timeStamp; } - - public long getContextBirthTime() { return loggerContextVO.getBirthTime(); } @@ -222,7 +217,7 @@ public class PubLoggingEventVO implements ILoggingEvent, Serializable { return false; return true; } - + public String toString() { StringBuilder sb = new StringBuilder(); sb.append(timeStamp); diff --git a/logback-core/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java b/logback-core/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java index 865f040..87a62b8 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java @@ -106,11 +106,13 @@ public abstract class SiftingAppenderBase<E> extends int nopaWarningCount = 0; NOPAppender<E> buildNOPAppender(String discriminatingValue) { - NOPAppender<E> nopa = new NOPAppender<E>(); if(nopaWarningCount < CoreConstants.MAX_ERROR_COUNT) { nopaWarningCount++; addError("Failed to build an appender for discriminating value ["+discriminatingValue+"]"); } + NOPAppender<E> nopa = new NOPAppender<E>(); + nopa.setContext(context); + nopa.start(); return nopa; } diff --git a/logback-examples/src/main/resources/setClasspath.cmd b/logback-examples/src/main/resources/setClasspath.cmd index 9b42ad0..9c7924a 100644 --- a/logback-examples/src/main/resources/setClasspath.cmd +++ b/logback-examples/src/main/resources/setClasspath.cmd @@ -10,5 +10,4 @@ set CLASSPATH=%CLASSPATH%;%LB_HOME%/logback-core-${project.version}.jar set CLASSPATH=%CLASSPATH%;%LB_HOME%/logback-examples/logback-examples-${project.version}.jar set CLASSPATH=%CLASSPATH%;%LB_HOME%/logback-examples/lib/slf4j-api-${slf4j.version}.jar - REM echo %CLASSPATH% diff --git a/pom.xml b/pom.xml index 4c24b04..eb436ae 100755 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ <properties>  - <slf4j.version>1.5.11</slf4j.version> + <slf4j.version>1.6.0-RC0</slf4j.version> <consolePlugin.version>1.1.0</consolePlugin.version> </properties> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 2 +- .../main/java/ch/qos/logback/classic/Logger.java | 70 +++++++++++--------- .../ch/qos/logback/classic/spi/LoggingEvent.java | 53 ++++++++++----- .../ch/qos/logback/classic/spi/LoggingEventVO.java | 7 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 18 ++--- .../joran/sift/{smoke.xml => lbclassic203.xml} | 5 +- .../ch/qos/logback/classic/issue/PackageTest.java | 4 +- .../lbclassic135/lbclassic139}/PackageTest.java | 5 +- .../issue/lbclassic154/LoggingAppender.java | 1 - .../issue/lbclassic203/ConcurrentSiftingTest.java | 45 ++++++++++++- ...tingTest.java => InstanceCountingAppender.java} | 17 +++-- .../issue/lbclassic203/LogbackRolloverTest.java | 67 ------------------- .../classic/issue/lbclassic203}/PackageTest.java | 7 +- .../logback/classic/sift/SiftingAppenderTest.java | 18 +++--- .../qos/logback/classic/spi/PubLoggingEventVO.java | 11 +-- .../qos/logback/core/sift/SiftingAppenderBase.java | 4 +- .../src/main/resources/setClasspath.cmd | 1 - pom.xml | 2 +- 18 files changed, 165 insertions(+), 172 deletions(-) copy logback-classic/src/test/input/joran/sift/{smoke.xml => lbclassic203.xml} (71%) copy logback-classic/src/test/java/ch/qos/logback/classic/{joran/conditional => issue/lbclassic135/lbclassic139}/PackageTest.java (85%) copy logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/{ConcurrentSiftingTest.java => InstanceCountingAppender.java} (62%) delete mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203/LogbackRolloverTest.java copy {logback-core/src/test/java/ch/qos/logback/core/helpers => logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic203}/PackageTest.java (86%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.20-9-g11ae2ad
by git-noreply＠pixie.qos.ch 21 Apr '10

21 Apr '10

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 "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 11ae2ad01ed9cc2f084b9b2c28a2c24c5faaf77b (commit) from 79ead2d851fac7eb07be5df9b520c15d7193c0e1 (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=logback.git;a=commit;h=11ae2ad01ed9cc2f084b9b2c… http://github.com/ceki/logback/commit/11ae2ad01ed9cc2f084b9b2c28a2c24c5faaf… commit 11ae2ad01ed9cc2f084b9b2c28a2c24c5faaf77b Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Apr 21 21:56:47 2010 +0200 - typo corrections diff --git a/logback-site/src/site/pages/access.html b/logback-site/src/site/pages/access.html index 5170e52..6ae4543 100644 --- a/logback-site/src/site/pages/access.html +++ b/logback-site/src/site/pages/access.html @@ -165,7 +165,7 @@ <code>ch.qos.logback.access.jetty.RequestLogImpl</code></a> class implements jetty's <code><a href="http://jetty.mortbay.org/apidocs/org/mortbay/jetty/RequestLog.html">RequestLog</a></code> - interface. Jetty delegates the manament of access logging + interface. Jetty delegates the management of access logging functionality to implementations of this interface. </p> @@ -214,11 +214,11 @@ <a name="configuration"></a> <h1>Logback-access configuration</h1> - <p>Altough similar, the <em>logback-access.xml</em> file is slightly + <p>Although similar, the <em>logback-access.xml</em> file is slightly different than its more common counterpart in logback-classic. Appenders and Layouts are declared the exact same way. However, in the access module there is no notion of loggers and consequently - logger elements are disallowed in logback-access configuraiton + logger elements are disallowed in logback-access configuration files. </p> @@ -242,9 +242,9 @@ It declares a <code>ConsoleAppender</code> which prints its output on the console. The <code>ConsoleAppender</code> contains a <code>PatternLayout</code> object responsible to format this - output. The log format is specied by the "%h %l %u %user %date + output. The log format is specified by the "%h %l %u %user %date "%r" %s %b" pattern which incidentally corresponds to Common Log - Format (CLF). This format is recognized by log analysers such as + Format (CLF). This format is recognized by log analyzers such as <a href="http://www.analog.cx/">Analog</a> or <a href="http://awstats.sourceforge.net/">AWStats</a>. </p> @@ -310,7 +310,7 @@ <p>Logback-access ships with an http-specific implementation of <a href="xref/ch/qos/logback/access/PatternLayout.html"> - <code>PatternLayout</code></a>. For detailled instructions on how + <code>PatternLayout</code></a>. For detailed instructions on how to use the <code>PatternLayout</code>, please refer to the <a href="manual/layouts.html#AccessPatternLayout">corresponding chapter</a> of the logback manual. @@ -341,8 +341,8 @@ CATALINA_OPTS="$CATALINA_OPTS -Dcom.sun.management.jmxremote.ssl=false" CATALINA_OPTS="$CATALINA_OPTS -Dcom.sun.management.jmxremote.authenticate=false"</pre></div> <p>After you launch Tomcat, you can access the MBeans exposed by - Tomcat throught he JConsole application, which can be started with - the following command: + Tomcat via the JConsole application, which can be started with the + following command: </p> <div class="source"><pre>jconsole</pre></div> @@ -455,7 +455,7 @@ CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/mx4j-impl.jar</pre></div> <p>For debugging purposes, it is often handy to capture the client request as well as the server response as is. The - <code>TeeFilter</code> was desgined precisely for this purpose. + <code>TeeFilter</code> was designed precisely for this purpose. </p> <p>The <code>TeeFilter</code> is a regular servlet filter. Like other @@ -477,10 +477,10 @@ CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/mx4j-impl.jar</pre></div> <p>We have tested <code>TeeFilter</code> to the best of our ability. However, since it duplicates the input stream of the request and the output stream of the response, it may interfere with - your application. For large input or output, it will add masurable + your application. For large input or output, it will add measurable latency. Although we have already fixed all currently known bugs, <code>TeeFilter</code> has broken otherwise correctly behaving - applications. Thus, in case of doubt, do not hesitate to disabl + applications. Thus, in case of doubt, do not hesitate to disable <code>TeeFilter</code>. </p> @@ -507,7 +507,7 @@ CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/mx4j-impl.jar</pre></div> </configuration></p> <p>Few clicks accessing the <a href="demo.html">logback-demo</a> - application configured as outlined above, yeilds:</p> + application configured as outlined above, yields:</p> <p class="source"><b>GET /logback-demo/index.jsp HTTP/1.1</b> Host: localhost:8080 ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/access.html | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.20-8-g79ead2d
by git-noreply＠pixie.qos.ch 21 Apr '10

21 Apr '10

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 "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 79ead2d851fac7eb07be5df9b520c15d7193c0e1 (commit) via c12af8fa602de776031ab7ec757ba0cacaa77b04 (commit) from 157bc935c2f939dc73137f1f01e1a1f36526f913 (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=logback.git;a=commit;h=79ead2d851fac7eb07be5df9… http://github.com/ceki/logback/commit/79ead2d851fac7eb07be5df9b520c15d7193c… commit 79ead2d851fac7eb07be5df9b520c15d7193c0e1 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Apr 21 17:06:10 2010 +0200 added link to Shibboleth diff --git a/logback-site/src/site/pages/index.html b/logback-site/src/site/pages/index.html index 3e79dd3..db39018 100644 --- a/logback-site/src/site/pages/index.html +++ b/logback-site/src/site/pages/index.html @@ -74,7 +74,7 @@ </ul> </td> - <td> + <td valign="top"> <ul> <li><a href="http://jmxmonitor.sourceforge.net/">JMX Monitor</a></li> <li><a href="http://www.opengda.org/">OpenGDA</a></li> @@ -87,6 +87,7 @@ <td valign="top"> <ul> <li><a href="http://scalate.fusesource.org/">Scalate</a></li> + <li><a href="http://shibboleth.internet2.edu/">Shibboleth</a></li> <li><a href="http://sonar.codehaus.org/">Sonar</a></li> <li><a href="http://static.springsource.org/s2-dmserver/2.0.x/user-guide/htmlsingle/user…">SpringSource http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=c12af8fa602de776031ab7ec… http://github.com/ceki/logback/commit/c12af8fa602de776031ab7ec757ba0cacaa77… commit c12af8fa602de776031ab7ec757ba0cacaa77b04 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Apr 20 17:35:47 2010 +0200 - Fixed http://jira.qos.ch/browse/LBCLASSIC-204 diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 7990a48..f6de8cc 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -718,49 +718,48 @@ public class MyApp3 { <p>The <code><logger></code> element may contain zero or more <code><appender-ref></code> elements; each appender thus - referenced is added to the named logger. It is important to keep - mind that each named logger that is declared with a - <code><logger></code> element first has all its appenders - removed and only then are the referenced appenders attached to it. - In particular, if there are no appender references, then the named - logger will lose all its appenders. + referenced is added to the named logger. Note that contrary to + log4j, logback-classic does <em>not</em> close or remove any + previously referenced appenders before adding the new appender + reference. </p> - <h4><a name="rootElement" href="#rootElement">Configuring the root - logger, or the <code><root></code> element</a></h4> + <h4><a name="rootElement" href="#rootElement">Configuring the root + logger, or the <code><root></code> element</a></h4> - <p>The <code><root></code> element configures the root logger. It - admits a single attribute, namely the <span - class="attr">level</span> attribute. It does not admit any other - attributes because the additivity flag does not apply to the root - logger. Moreover, since the root logger is already named as "ROOT", - it does not admit a name attribute either. The value of the level - attribute can be one of the case-insensitive strings TRACE, DEBUG, - INFO, WARN, ERROR, ALL or OFF. Note that the level of the root - logger cannot be set to INHERITED or NULL. - </p> + <p>The <code><root></code> element configures the root + logger. It admits a single attribute, namely the <span + class="attr">level</span> attribute. It does not admit any other + attributes because the additivity flag does not apply to the root + logger. Moreover, since the root logger is already named as + "ROOT", it does not admit a name attribute either. The value of the + level attribute can be one of the case-insensitive strings TRACE, + DEBUG, INFO, WARN, ERROR, ALL or OFF. Note that the level of the + root logger cannot be set to INHERITED or NULL. + </p> - <p>The <code><root></code> element admits zero or more - <code><appender-ref></code> elements. Similar to the - <code><logger></code> element, declaring a <code><root></code> - element will have the effect of first closing and then detaching all - its current appenders and only subsequently will referenced - appenders, if any, will be added. In particular, if the - <code><root></code> element contains no appender references, then - the root logger will lose all its appenders. - </p> + <p>The <code><root></code> element admits zero or more + <code><appender-ref></code> elements. Similar to the + <code><logger></code> element, the <code><root></code> + element may contain zero or more <code><appender-ref></code> + elements; each appender thus referenced is added to the root + logger. Note that contrary to log4j, logback-classic does + <em>not</em> close or remove any previously referenced appenders + before adding the new appender reference to the root logger. + </p> - <h4>Example</h4> + <h4>Example</h4> - <p>Setting the level of a logger or root logger is as simple as - declaring it and setting its level, as the next example - illustrates. Suppose we are no longer interested in seeing any DEBUG - messages from any component belonging to the "chapters.configuration" package. The - following configuration file shows how to achieve that. - </p> + <p>Setting the level of a logger or root logger is as simple as + declaring it and setting its level, as the next example + illustrates. Suppose we are no longer interested in seeing any + DEBUG messages from any component belonging to the + "chapters.configuration" package. The following configuration file + shows how to achieve that. + </p> <em>Example: Setting the level of a logger (logback-examples/src/main/java/chapters/configuration/sample2.xml)</em> <pre class="prettyprint source"><configuration> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/index.html | 3 +- .../src/site/pages/manual/configuration.html | 67 ++++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0