November 2009 - logback-dev

[JIRA] Created: (LBCLASSIC-120) Joran configuration not working in OSGi environment
by Pavol Juhos (JIRA) 03 Dec '09

03 Dec '09

Joran configuration not working in OSGi environment --------------------------------------------------- Key: LBCLASSIC-120 URL: http://jira.qos.ch/browse/LBCLASSIC-120 Project: logback-classic Issue Type: Bug Components: joran Affects Versions: 0.9.15 Environment: OSGi Service Platform Release 4 Reporter: Pavol Juhos Assignee: Logback dev list When running in OSGi environment, JoranConfigurator throws a ClassCastException when trying to parse the Logback XML configuration file. The problem seems to be caused by OSGi-unfriendly JAXP parser discovery mechanism as suggested by Dieter Wimberger in his blog post -- http://wimpi.coalevo.net/2008/04/hack-how-to-use-logback.html "[...] JAXP discovery mechanism assume visibility of the parser through the context ClassLoader of the actual thread, which may cause some troubles." Observed exception stack trace: Failed to auto configure default logger context Reported exception: ch.qos.logback.core.joran.spi.JoranException: Parser configuration error occured at ch.qos.logback.core.joran.event.SaxEventRecorder.recordEvents(SaxEventRecorder.java:63) at ch.qos.logback.core.joran.GenericConfigurator.doConfigure(GenericConfigurator.java:105) at ch.qos.logback.core.joran.GenericConfigurator.doConfigure(GenericConfigurator.java:76) at ch.qos.logback.core.joran.GenericConfigurator.doConfigure(GenericConfigurator.java:40) at ch.qos.logback.classic.util.ContextInitializer.configureByResource(ContextInitializer.java:47) at ch.qos.logback.classic.util.ContextInitializer.autoConfig(ContextInitializer.java:108) at org.slf4j.impl.StaticLoggerBinder.init(StaticLoggerBinder.java:85) at org.slf4j.impl.StaticLoggerBinder.<clinit>(StaticLoggerBinder.java:56) at org.slf4j.LoggerFactory.getSingleton(LoggerFactory.java:189) at org.slf4j.LoggerFactory.bind(LoggerFactory.java:112) at org.slf4j.LoggerFactory.performInitialization(LoggerFactory.java:105) at org.slf4j.LoggerFactory.getILoggerFactory(LoggerFactory.java:235) at org.slf4j.LoggerFactory.getLogger(LoggerFactory.java:208) at org.slf4j.LoggerFactory.getLogger(LoggerFactory.java:221) at com.foo.bar.server.config.Configuration.<clinit>(Configuration.java:244) at com.foo.bar.server.ServerBundleActivator.start(ServerBundleActivator.java:39) at org.apache.felix.framework.util.SecureAction.startActivator(SecureAction.java:589) at org.apache.felix.framework.Felix._startBundle(Felix.java:1671) at org.apache.felix.framework.Felix.startBundle(Felix.java:1588) at org.apache.felix.framework.Felix.setFrameworkStartLevel(Felix.java:1180) at org.apache.felix.framework.StartLevelImpl.run(StartLevelImpl.java:265) at java.lang.Thread.run(Unknown Source) Caused by: java.lang.ClassCastException: org.apache.xerces.jaxp.SAXParserFactoryImpl at javax.xml.parsers.SAXParserFactory.newInstance(Unknown Source) at ch.qos.logback.core.joran.event.SaxEventRecorder.recordEvents(SaxEventRecorder.java:56) ... 21 more -- 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

3 4

[JIRA] Created: (LBCLASSIC-101) Problem with logback OSGi bundles
by Ceki Gulcu (JIRA) 03 Dec '09

03 Dec '09

Problem with logback OSGi bundles --------------------------------- Key: LBCLASSIC-101 URL: http://jira.qos.ch/browse/LBCLASSIC-101 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.14 Reporter: Ceki Gulcu Assignee: Logback dev list Priority: Critical http://www.slf4j.org/pipermail/user/2009-January/000661.html http://www.slf4j.org/pipermail/user/2009-January/000663.html -- 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 3

[JIRA] Created: (LBCLASSIC-153) Excessive synchronization in ReconfigureOnChangeFilter.decide
by Anders Wallgren (JIRA) 03 Dec '09

03 Dec '09

Excessive synchronization in ReconfigureOnChangeFilter.decide ------------------------------------------------------------- Key: LBCLASSIC-153 URL: http://jira.qos.ch/browse/LBCLASSIC-153 Project: logback-classic Issue Type: Bug Affects Versions: 0.917 Reporter: Anders Wallgren Assignee: Logback dev list The synchronization in ReconfigureOnChangeFilter.decide hurts scalability. It seems unnecessary to serialize the code in changeDetected -- it should be possible to use atomic updates of nextCheck and lastModified and only serialize the actual reconfiguration. -- 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

3 9

[JIRA] Created: (LBCLASSIC-154) All threads become blocked in ReconfigureOnChangeFilter when changing log level under load
by Andrew Perrine (JIRA) 03 Dec '09

03 Dec '09

All threads become blocked in ReconfigureOnChangeFilter when changing log level under load ------------------------------------------------------------------------------------------ Key: LBCLASSIC-154 URL: http://jira.qos.ch/browse/LBCLASSIC-154 Project: logback-classic Issue Type: Bug Affects Versions: 0.917 Environment: Linux metro2a.star.dev.diginsite.com 2.6.18-128.1.1.el5 #1 SMP Mon Jan 26 13:58:24 EST 2009 x86_64 x86_64 x86_64 GNU/Linux Java(TM) SE Runtime Environment (build 1.6.0_11-b03) Java HotSpot(TM) 64-Bit Server VM (build 11.0-b16, mixed mode) Reporter: Andrew Perrine Assignee: Logback dev list We were testing logback's new <configuration scan="true"> feature and when we changed the logging level while our application was under load, all threads became blocked inside logback (full stack trace is very long, here are two examples): "http-0.0.0.0-8080-148" daemon prio=10 tid=0x00002aab58679800 nid=0x26ed waiting for monitor entry [0x000000004e617000..0x000000004e618c10] java.lang.Thread.State: BLOCKED (on object monitor) at ch.qos.logback.classic.turbo.ReconfigureOnChangeFilter.decide(ReconfigureOnChangeFilter.java:99) - waiting to lock <0x00002aaabd743d58> (a ch.qos.logback.classic.LoggerContext) at ch.qos.logback.classic.spi.TurboFilterList.getTurboFilterChainDecision(TurboFilterList.java:47) at ch.qos.logback.classic.LoggerContext.getTurboFilterChainDecision_0_3OrMore(LoggerContext.java:251) at ch.qos.logback.classic.Logger.callTurboFilters(Logger.java:770) at ch.qos.logback.classic.Logger.isDebugEnabled(Logger.java:488) at ch.qos.logback.classic.Logger.isDebugEnabled(Logger.java:484) at org.slf4j.ext.LoggerWrapper.debug(LoggerWrapper.java:238) at com.diginsite.product.ofx.presentation.CustomRequestWrapper.addCNtoOFXRequest(OFXFilter.java:191) at com.diginsite.product.ofx.presentation.CustomRequestWrapper.<init>(OFXFilter.java:153) at com.diginsite.product.ofx.presentation.OFXFilter.doFilter(OFXFilter.java:56) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.hyperic.hq.product.servlet.filter.JMXFilter.doFilter(JMXFilter.java:324) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.jboss.web.tomcat.filters.ReplyHeaderFilter.doFilter(ReplyHeaderFilter.java:96) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:230) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:175) at org.jboss.web.tomcat.security.SecurityAssociationValve.invoke(SecurityAssociationValve.java:182) at org.jboss.web.tomcat.security.JaccContextValve.invoke(JaccContextValve.java:84) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102) at org.jboss.web.tomcat.service.jca.CachedConnectionValve.invoke(CachedConnectionValve.java:157) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:262) at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:844) at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:583) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:446) at java.lang.Thread.run(Thread.java:619) "http-0.0.0.0-8080-15" daemon prio=10 tid=0x00002aab600b0400 nid=0x5669 waiting on condition [0x0000000046799000..0x000000004679ac10] java.lang.Thread.State: WAITING (parking) at sun.misc.Unsafe.park(Native Method) - parking to wait for <0x00002aaabd755128> (a java.util.concurrent.locks.ReentrantReadWriteLock$NonfairSync) at java.util.concurrent.locks.LockSupport.park(LockSupport.java:158) at java.util.concurrent.locks.AbstractQueuedSynchronizer.parkAndCheckInterrupt(AbstractQueuedSynchronizer.java:747) at java.util.concurrent.locks.AbstractQueuedSynchronizer.doAcquireShared(AbstractQueuedSynchronizer.java:877) at java.util.concurrent.locks.AbstractQueuedSynchronizer.acquireShared(AbstractQueuedSynchronizer.java:1197) at java.util.concurrent.locks.ReentrantReadWriteLock$ReadLock.lock(ReentrantReadWriteLock.java:594) at ch.qos.logback.core.spi.AppenderAttachableImpl.appendLoopOnAppenders(AppenderAttachableImpl.java:57) at ch.qos.logback.classic.Logger.appendLoopOnAppenders(Logger.java:271) at ch.qos.logback.classic.Logger.callAppenders(Logger.java:258) at ch.qos.logback.classic.Logger.buildLoggingEventAndAppend(Logger.java:440) at ch.qos.logback.classic.Logger.filterAndLog_0_Or3Plus(Logger.java:394) at ch.qos.logback.classic.Logger.log(Logger.java:813) at org.slf4j.ext.EventLogger.logEvent(EventLogger.java:36) at com.diginsite.services.logging.LoggerUtil.logEvent(LoggerUtil.java:29) -- 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

4 14

[JIRA] Created: (LBCORE-122) Joran IncludeAction does not close the input file stream in case of SaxParseException
by Michael Franz (JIRA) 01 Dec '09

01 Dec '09

Joran IncludeAction does not close the input file stream in case of SaxParseException ------------------------------------------------------------------------------------- Key: LBCORE-122 URL: http://jira.qos.ch/browse/LBCORE-122 Project: logback-core Issue Type: Bug Components: Joran Affects Versions: 0.9.17 Reporter: Michael Franz Assignee: Logback dev list If parsing include file for a Joran configuration fails e.g. with a SaxParseException then the include file stream is not closed immediately. Depending on the operation system fixing the configuration file requires to stop the Java VM or perhaps to run the garbage collector explicitly. >From IncludeAction.java: InputStream in = getInputStream(ec, attributes); try { if (in != null) { parseAndRecord(in, recorder); in.close(); } } catch (JoranException e) { addError("Error while parsing " + attributeInUse, e); } catch (IOException e) { // called if in.close did not work } The in.close() should be called in a finally block, so the the stream is ensured to be closed. -- 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

[JIRA] Created: (LBCORE-119) ReconfigureOnChangeFilter doesn't pick up changes if there are spaces in the filename
by Anders Wallgren (JIRA) 01 Dec '09

01 Dec '09

ReconfigureOnChangeFilter doesn't pick up changes if there are spaces in the filename ------------------------------------------------------------------------------------- Key: LBCORE-119 URL: http://jira.qos.ch/browse/LBCORE-119 Project: logback-core Issue Type: Bug Affects Versions: 0.9.17 Reporter: Anders Wallgren Assignee: Logback dev list ReconfigureOnChangeFilter.start doesn't unencode the URL encoding of spaces, so it will never detect changes since the url-encoded filename doesn't exist. -- 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 7

branch, master, updated. b018525e30ef54b8096d9c9cb9ae7db67eed1a6a
by git-noreply＠pixie.qos.ch 30 Nov '09

30 Nov '09

The branch, master has been updated via b018525e30ef54b8096d9c9cb9ae7db67eed1a6a (commit) from c1945db449459277f2bdd97d9bfb97253cefb4a4 (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=b018525e30ef54b8096d9c9c… http://github.com/ceki/logback/commit/b018525e30ef54b8096d9c9cb9ae7db67eed1… commit b018525e30ef54b8096d9c9cb9ae7db67eed1a6a Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Dec 1 00:12:40 2009 +0100 added a test case based on LBCORE-127 diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java b/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java index 63cbcd1..4693400 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java @@ -46,6 +46,7 @@ public abstract class GenericConfigurator extends ContextAwareBase { URLConnection urlConnection = url.openConnection(); // per http://jira.qos.ch/browse/LBCORE-105 urlConnection.setDefaultUseCaches(false); + InputStream in = urlConnection.getInputStream(); doConfigure(in); in.close(); diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java index c081b4f..9e5ea44 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java @@ -17,9 +17,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.net.URL; import java.util.HashMap; import java.util.jar.JarOutputStream; @@ -51,10 +54,10 @@ public class TrivialConfiguratorTest { TrivialConfigurator trivialConfigurator = new TrivialConfigurator(rulesMap); trivialConfigurator.setContext(context); - trivialConfigurator.doConfigure(CoreTestConstants.TEST_DIR_PREFIX + "input/joran/" - + filename); + trivialConfigurator.doConfigure(CoreTestConstants.TEST_DIR_PREFIX + + "input/joran/" + filename); } - + @Test public void smoke() throws Exception { int oldBeginCount = IncAction.beginCount; @@ -115,6 +118,34 @@ public class TrivialConfiguratorTest { assertFalse(jarFile.exists()); } + @Test + public void lbcore127() throws IOException, JoranException { + String jarEntry = "buzz.xml"; + String jarEntry2 = "Lightyear.xml"; + + File jarFile = makeJarFile(); + fillInJarFile(jarFile, jarEntry, jarEntry2); + + + URL url = asURL(jarFile, jarEntry); + URL url2 = asURL(jarFile, jarEntry2); + + InputStream resourceAsStream = url2.openStream(); + BufferedReader reader = new BufferedReader(new InputStreamReader( + resourceAsStream)); + + TrivialConfigurator tc = new TrivialConfigurator(rulesMap); + tc.setContext(context); + tc.doConfigure(url); + reader.readLine(); + + reader.close(); + + // deleting an open file fails + assertTrue(jarFile.delete()); + assertFalse(jarFile.exists()); + } + File makeJarFile() { File outputDir = new File(CoreTestConstants.OUTPUT_DIR_PREFIX); outputDir.mkdirs(); @@ -125,10 +156,20 @@ public class TrivialConfiguratorTest { private void fillInJarFile(File jarFile, String jarEntryName) throws IOException { + fillInJarFile(jarFile, jarEntryName, null); + } + + private void fillInJarFile(File jarFile, String jarEntryName, + String secondJarEntry) throws IOException { JarOutputStream jos = new JarOutputStream(new FileOutputStream(jarFile)); jos.putNextEntry(new ZipEntry(jarEntryName)); jos.write("<x/>".getBytes()); jos.closeEntry(); + if (secondJarEntry != null) { + jos.putNextEntry(new ZipEntry(secondJarEntry)); + jos.write("<y/>".getBytes()); + jos.closeEntry(); + } jos.close(); } ----------------------------------------------------------------------- Summary of changes: .../logback/core/joran/GenericConfigurator.java | 1 + .../core/joran/TrivialConfiguratorTest.java | 47 ++++++++++++++++++- 2 files changed, 45 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. c1945db449459277f2bdd97d9bfb97253cefb4a4
by git-noreply＠pixie.qos.ch 30 Nov '09

30 Nov '09

The branch, master has been updated via c1945db449459277f2bdd97d9bfb97253cefb4a4 (commit) from f7121aba34e0faef82ca46ea8e2d7b0dfc9bd593 (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=c1945db449459277f2bdd97d… http://github.com/ceki/logback/commit/c1945db449459277f2bdd97d9bfb97253cefb… commit c1945db449459277f2bdd97d9bfb97253cefb4a4 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Nov 30 23:16:43 2009 +0100 - Fixed http://jira.qos.ch/browse/LBCLASSIC-102 and added relevant test cases diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 286d0e6..cbb6bea 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -215,8 +215,11 @@ of java code. --> <Import-Package> - sun.reflect;resolution:=optional, javax.*;resolution:=optional, - ch.qos.logback.core.rolling, ch.qos.logback.core.rolling.helper, + sun.reflect;resolution:=optional, + javax.*;resolution:=optional, + org.xml.*;resolution:=optional, + ch.qos.logback.core.rolling, + ch.qos.logback.core.rolling.helper, * </Import-Package> diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java b/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java index 03038b5..b2a9fe5 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java @@ -14,7 +14,6 @@ package ch.qos.logback.classic; public class ClassicConstants { - static public final char LOGGER_SEPARATOR = '.'; static public final String USER_MDC_KEY = "user"; public static final String LOGBACK_CONTEXT_SELECTOR = "logback.ContextSelector"; 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 cc3cd17..50d6de9 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 @@ -28,6 +28,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.LoggerRemoteView; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.Appender; +import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.spi.AppenderAttachable; import ch.qos.logback.core.spi.AppenderAttachableImpl; import ch.qos.logback.core.spi.FilterReply; @@ -287,12 +288,33 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, return aai.detachAppender(appender); } + static int getSeparatorIndexOf(String name) { + return getSeparatorIndexOf(name, 0); + } + + /** + * Get the position of the separator character, if any, starting at position + * 'fromIndex'. + * + * @param name + * @param fromIndex + * @return + */ + static int getSeparatorIndexOf(String name, int fromIndex) { + int i = name.indexOf(CoreConstants.DOT, fromIndex); + 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 syncronized block on + * <p> IMPORTANT: Calls to this method must be within a synchronized block on * this logger. * * @param lastPart @@ -302,11 +324,11 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, * @return */ Logger createChildByLastNamePart(final String lastPart) { - int i_index = lastPart.indexOf(ClassicConstants.LOGGER_SEPARATOR); + int i_index = getSeparatorIndexOf(lastPart); if (i_index != -1) { throw new IllegalArgumentException("Child name [" + lastPart + " passed as parameter, may not include [" - + ClassicConstants.LOGGER_SEPARATOR + "]"); + + CoreConstants.DOT + "]"); } if (childrenList == null) { @@ -317,7 +339,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, childLogger = new Logger(lastPart, this, this.loggerContext); } else { childLogger = new Logger( - name + ClassicConstants.LOGGER_SEPARATOR + lastPart, this, + name + CoreConstants.DOT + lastPart, this, this.loggerContext); } childrenList.add(childLogger); @@ -353,7 +375,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 = childName.indexOf(ClassicConstants.LOGGER_SEPARATOR, this.name + int i_index = getSeparatorIndexOf(childName, this.name .length() + 1); if (i_index != -1) { throw new IllegalArgumentException("For logger [" + this.name diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java b/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java index 0c4663a..1fdbaeb 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java @@ -134,7 +134,7 @@ public class LoggerContext extends ContextBase implements ILoggerFactory, // in between as well (if they don't already exist) String childName; while (true) { - int h = name.indexOf(ClassicConstants.LOGGER_SEPARATOR, i); + int h = Logger.getSeparatorIndexOf(name, i); if (h == -1) { childName = name; } else { diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java index eed7c7e..7f761e2 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java @@ -24,6 +24,9 @@ import ch.qos.logback.core.CoreConstants; public class ClassNameOnlyAbbreviator implements Abbreviator { public String abbreviate(String fqClassName) { + // we ignore the fact that the separator character can also be a dollar + // If the inner class is org.good.AClass#Inner, returning + // AClass#Inner seems most appropriate int lastIndex = fqClassName.lastIndexOf(CoreConstants.DOT); if (lastIndex != -1) { return fqClassName.substring(lastIndex + 1, fqClassName.length()); diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java index eac2e65..f4aac29 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java @@ -21,7 +21,7 @@ public class TargetLengthBasedClassNameAbbreviator implements Abbreviator { final int targetLength; public TargetLengthBasedClassNameAbbreviator(int targetLength) { - this.targetLength = targetLength; + this.targetLength = targetLength; } public String abbreviate(String fqClassName) { @@ -36,9 +36,9 @@ public class TargetLengthBasedClassNameAbbreviator implements Abbreviator { } int[] dotIndexesArray = new int[ClassicConstants.MAX_DOTS]; - // a.b.c contains 2 dots but 2+1 parts. + // a.b.c contains 2 dots but 2+1 parts. // see also http://jira.qos.ch/browse/LBCLASSIC-110 - int[] lengthArray = new int[ClassicConstants.MAX_DOTS+1]; + int[] lengthArray = new int[ClassicConstants.MAX_DOTS + 1]; int dotCount = computeDotIndexes(fqClassName, dotIndexesArray); @@ -55,8 +55,8 @@ public class TargetLengthBasedClassNameAbbreviator implements Abbreviator { if (i == 0) { buf.append(fqClassName.substring(0, lengthArray[i] - 1)); } else { - buf.append(fqClassName.substring(dotIndexesArray[i - 1], dotIndexesArray[i - 1] - + lengthArray[i])); + buf.append(fqClassName.substring(dotIndexesArray[i - 1], + dotIndexesArray[i - 1] + lengthArray[i])); } // System.out.println("i=" + i + ", buf=" + buf); } @@ -64,11 +64,12 @@ public class TargetLengthBasedClassNameAbbreviator implements Abbreviator { return buf.toString(); } - static int computeDotIndexes(final String className, int[] dotArray) { int dotCount = 0; int k = 0; while (true) { + // ignore the $ separator in our computations. This is both convenient + // and sensible. k = className.indexOf(CoreConstants.DOT, k); if (k != -1 && dotCount < ClassicConstants.MAX_DOTS) { dotArray[dotCount] = k; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/HLogger.java b/logback-classic/src/test/java/ch/qos/logback/classic/HLogger.java index c490af3..b1add24 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/HLogger.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/HLogger.java @@ -24,6 +24,7 @@ import ch.qos.logback.classic.ClassicConstants; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; +import ch.qos.logback.core.CoreConstants; public class HLogger extends MarkerIgnoringBase { @@ -237,10 +238,10 @@ public class HLogger extends MarkerIgnoringBase { * @return */ HLogger createChildByLastNamePart(final String lastPart) { - int i_index = lastPart.indexOf(ClassicConstants.LOGGER_SEPARATOR); + int i_index = lastPart.indexOf(CoreConstants.DOT); if (i_index != -1) { throw new IllegalArgumentException("Child name [" + lastPart - + " passed as parameter, may not include [" + ClassicConstants.LOGGER_SEPARATOR + + " passed as parameter, may not include [" + CoreConstants.DOT + "]"); } @@ -251,7 +252,7 @@ public class HLogger extends MarkerIgnoringBase { if (this.isRootLogger()) { childHLogger = new HLogger(lastPart, this); } else { - childHLogger = new HLogger(name + ClassicConstants.LOGGER_SEPARATOR + lastPart, + childHLogger = new HLogger(name + CoreConstants.DOT + lastPart, this); } childrenMap.put(lastPart, childHLogger); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/LoggerTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/LoggerTest.java index 5507ff9..f6350f9 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/LoggerTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/LoggerTest.java @@ -134,9 +134,30 @@ public class LoggerTest { assertFalse(logger.isTraceEnabled()); assertFalse(logger.isEnabledFor(Level.TRACE)); } + } + + @Test + public void innerClass_I() { + root.setLevel(Level.DEBUG); + Logger a = lc.getLogger("a"); + a.setLevel(Level.INFO); + Logger a_b = lc.getLogger("a$b"); + assertEquals(Level.INFO, a_b.getEffectiveLevel()); + } + @Test + public void innerClass_II() { + root.setLevel(Level.DEBUG); + Logger a = lc.getLogger(this.getClass()); + a.setLevel(Level.INFO); + Logger a_b = lc.getLogger(new Inner().getClass()); + assertEquals(Level.INFO, a_b.getEffectiveLevel()); } + + class Inner { + } + @Test public void testEnabled_All() throws Exception { root.setLevel(Level.ALL); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlLoggerContext.java b/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlLoggerContext.java index 571cdb2..651af43 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlLoggerContext.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlLoggerContext.java @@ -18,6 +18,7 @@ import java.util.Map; import ch.qos.logback.classic.ClassicConstants; import ch.qos.logback.classic.Level; +import ch.qos.logback.core.CoreConstants; /** * This logger context quite optimized for logger retrieval. @@ -80,7 +81,7 @@ public class ControlLoggerContext { int i = 0; while (true) { - i = name.indexOf(ClassicConstants.LOGGER_SEPARATOR, i); + i = name.indexOf(CoreConstants.DOT, i); if (i == -1) { // System.out.println("FINAL-Creating logger named [" + name + "] with // parent " + parent.getName()); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java b/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java index cf2c734..ead333b 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java @@ -17,6 +17,7 @@ import java.util.LinkedList; import ch.qos.logback.classic.ClassicConstants; import ch.qos.logback.classic.Level; +import ch.qos.logback.core.CoreConstants; public class ScenarioMaker { @@ -76,7 +77,7 @@ public class ScenarioMaker { childName = ScenarioRandomUtil.randomId(); count += childName.length(); } else { - childName = loggerName + ClassicConstants.LOGGER_SEPARATOR + childName = loggerName + CoreConstants.DOT + ScenarioRandomUtil.randomId(); count += childName.length(); } diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 873db19..270ed8d 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -137,6 +137,7 @@ <Export-Package>ch.qos.logback.core.*</Export-Package> <Import-Package> javax.*;resolution:=optional, + org.xml.*;resolution:=optional, org.codehaus.janino;resolution:=optional, * </Import-Package> diff --git a/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java b/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java index 5258d1b..520c5f4 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java +++ b/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java @@ -91,9 +91,12 @@ public class CoreConstants { * Ceki's machine (Orion) */ public static long REFERENCE_BIPS = 9000; + + + static public final char DOT = '.'; - static public final char TAB = '\t'; + static public final char DOLLAR = '$'; static public final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set"; diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 9d0d4a2..68eb6b0 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -71,6 +71,12 @@ event instead of its own context name. </p> + <p>When a logger is named after an inner class, the '$' is used as + a separator, instead of the usual '.'. This fixes the level + inheritence issue described in <a + href="http://jira.qos.ch/browse/LBCLASSIC-102">LBCLASSIC-102</a> + and as reported by Joern Huxhorn.</p> + <hr width="80%" align="center" /> <h3>9th of August 2009 - Release of version 0.9.17</h3> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 7 +++- .../ch/qos/logback/classic/ClassicConstants.java | 1 - .../main/java/ch/qos/logback/classic/Logger.java | 32 ++++++++++++++++--- .../java/ch/qos/logback/classic/LoggerContext.java | 2 +- .../classic/pattern/ClassNameOnlyAbbreviator.java | 3 ++ .../TargetLengthBasedClassNameAbbreviator.java | 13 ++++---- .../test/java/ch/qos/logback/classic/HLogger.java | 7 ++-- .../java/ch/qos/logback/classic/LoggerTest.java | 21 +++++++++++++ .../classic/control/ControlLoggerContext.java | 3 +- .../qos/logback/classic/control/ScenarioMaker.java | 3 +- logback-core/pom.xml | 1 + .../java/ch/qos/logback/core/CoreConstants.java | 5 ++- logback-site/src/site/pages/news.html | 6 ++++ 13 files changed, 83 insertions(+), 21 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. f7121aba34e0faef82ca46ea8e2d7b0dfc9bd593
by git-noreply＠pixie.qos.ch 30 Nov '09

30 Nov '09

The branch, master has been updated via f7121aba34e0faef82ca46ea8e2d7b0dfc9bd593 (commit) from a60e0ea2bd6b90220df2f0d9d5296ca3a25d1cca (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=f7121aba34e0faef82ca46ea… http://github.com/ceki/logback/commit/f7121aba34e0faef82ca46ea8e2d7b0dfc9bd… commit f7121aba34e0faef82ca46ea8e2d7b0dfc9bd593 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Nov 30 10:09:41 2009 +0100 - added references to new articles in the docs diff --git a/logback-site/src/site/pages/documentation.html b/logback-site/src/site/pages/documentation.html index e426b97..90a9de4 100644 --- a/logback-site/src/site/pages/documentation.html +++ b/logback-site/src/site/pages/documentation.html @@ -83,6 +83,9 @@ up</a>. </li> + <li><a href="http://it-bubbles.wikidot.com/blog:3">Griffon And + org.slf4j (Logback)</a> by Michal Novak</li> + <li><a href="http://www.infoq.com/news/2007/08/logback">Logback: Evolving Java Logging</a> by Geoffrey Wiseman </li> @@ -90,8 +93,17 @@ <li><a href="http://blog.kornr.net/index.php/2008/12/09/understanding-the-osgi-logging-s…">Understanding the OSGI logging service</a> by Nogunner</li> - </ul> + + <h4>In french</h4> + + <ul> + <li><a + href="http://www.insideit.fr/post/2009/11/23/SLF4J-LOGBack">SLF4J + & LOGBack : simplifiez-vous les logs</a> by Ludovic Meurillon + </li> + </ul> + <h2>Conferences</h2> <table cellspacing="20" border="0"> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/documentation.html | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. a60e0ea2bd6b90220df2f0d9d5296ca3a25d1cca
by git-noreply＠pixie.qos.ch 28 Nov '09

28 Nov '09

The branch, master has been updated via a60e0ea2bd6b90220df2f0d9d5296ca3a25d1cca (commit) from 0908ef4dc8bebd0c8f38dbdd4c2d0282a01d77fb (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=a60e0ea2bd6b90220df2f0d9… http://github.com/ceki/logback/commit/a60e0ea2bd6b90220df2f0d9d5296ca3a25d1… commit a60e0ea2bd6b90220df2f0d9d5296ca3a25d1cca Author: Ceki Gulcu <ceki(a)qos.ch> Date: Sat Nov 28 23:58:39 2009 +0100 - fixed race condition by having the test wait for the compresison thread at least once before the next rollover occurs This is OK, since in production, the rollver period is much much longer than the time it takes to do compression. In our tests however, this reation does not hold. diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java index d152d6d..02cc66a 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java @@ -36,6 +36,7 @@ public class SizeAndTimeBasedFNATP<E> extends super.start(); archiveRemover = new SizeAndTimeBasedArchiveRemover(tbrp.fileNamePattern, rc); + archiveRemover.setContext(context); // we need to get the correct value of currentPeriodsCounter. // usually the value is 0, unless the appender or the application diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java index 2d3dcd4..1387f12 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java @@ -22,7 +22,9 @@ import java.util.Calendar; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -110,7 +112,6 @@ public class TimeBasedRollingWithArchiveRemovalTest { + "}/clean.txt.zip", MILLIS_IN_MONTH, maxHistory, numPeriods); int beginPeriod = Calendar.getInstance().get(Calendar.MONTH); boolean extraFolder = extraFolder(numPeriods, 12, beginPeriod, maxHistory); - StatusPrinter.print(context); check(expectedCountWithFolders(2, extraFolder)); } @@ -145,9 +146,10 @@ public class TimeBasedRollingWithArchiveRemovalTest { doRollover( randomOutputDir + "/%d{" + DAILY_DATE_PATTERN + "}-clean.%i.zip", MILLIS_IN_DAY, 5, 5 * 4); - + // make .zip optional so that if for one reason or another, no size-based - // rollover occurs on the last period, that the last period is still accounted + // rollover occurs on the last period, that the last period is still + // accounted // for checkPatternCompliance(5 + 1 + slashCount, "\\d{4}-\\d{2}-\\d{2}-clean(\\.\\d)(.zip)?"); @@ -198,12 +200,22 @@ public class TimeBasedRollingWithArchiveRemovalTest { tbrp.timeBasedTriggering.setCurrentTime(addTime(tbrp.timeBasedTriggering .getCurrentTime(), periodDurationInMillis / ticksPerPeriod)); + // wait every now and then for the compression job + // otherwise, we might rollover a file for a given period before a previous + // period's compressor had a chance to run + if(i % (ticksPerPeriod/2) == 0) { + waitForCompression(tbrp); + } } - + waitForCompression(tbrp); + rfa.stop(); + } + + void waitForCompression(TimeBasedRollingPolicy<Object> tbrp) + throws InterruptedException, ExecutionException, TimeoutException { if (tbrp.future != null && !tbrp.future.isDone()) { tbrp.future.get(200, TimeUnit.MILLISECONDS); } - rfa.stop(); } void findAllFoldersRecursively(File dir, List<File> fileList) { @@ -281,7 +293,7 @@ public class TimeBasedRollingWithArchiveRemovalTest { // year is 2012, and not 2013 (the current year). boolean extraFolder(int numPeriods, int periodsPerEra, int beginPeriod, int maxHistory) { - int adjustedBegin = beginPeriod+1; + int adjustedBegin = beginPeriod + 1; int remainder = ((adjustedBegin) + numPeriods) % periodsPerEra; return (remainder < maxHistory + 1); } ----------------------------------------------------------------------- Summary of changes: .../core/rolling/SizeAndTimeBasedFNATP.java | 1 + .../TimeBasedRollingWithArchiveRemovalTest.java | 24 +++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0