- logback-dev - mailman3.qos.ch

svn commit: r1840 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 21:27:54 2008 New Revision: 1840 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/LoginAuthenticator.java Log: - copyright statement Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/LoginAuthenticator.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/LoginAuthenticator.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/LoginAuthenticator.java Wed Oct 15 21:27:54 2008 @@ -1,3 +1,13 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + package ch.qos.logback.core.net; import javax.mail.Authenticator;

1 0

svn commit: r1839 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 21:27:28 2008 New Revision: 1839 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayoutTest.java Log: new test case on parentheses closing in patterns Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayoutTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayoutTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayoutTest.java Wed Oct 15 21:27:28 2008 @@ -45,15 +45,28 @@ assertEquals("x123", s); } + + + @Test + public void testEscapeClosingParentheses() { + PatternLayoutBase<Object> plb = getPatternLayoutBase(); + Context context = new ContextBase(); + plb.setContext(context); + plb.setPattern("x(%OTT\\)y"); + plb.start(); + String s = plb.doLayout(new Object()); + assertEquals("x(123)y", s); + } + @Test - public void testParentheses() { + public void testEscapeBothParentheses() { PatternLayoutBase<Object> plb = getPatternLayoutBase(); Context context = new ContextBase(); plb.setContext(context); - plb.setPattern("x(%OTT\\)"); + plb.setPattern("x\\(%OTT\\)y"); plb.start(); String s = plb.doLayout(new Object()); - assertEquals("x(123)", s); + assertEquals("x(123)y", s); } @Test

1 0

[JIRA] Resolved: (LBCORE-23) Parser stops at ')'
by Ceki Gulcu (JIRA) 15 Oct '08

15 Oct '08

[ http://jira.qos.ch/browse/LBCORE-23?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu resolved LBCORE-23. ------------------------------ Fix Version/s: 0.9.10 Resolution: Fixed "Fixed" with better documentation. > Parser stops at ')' > ------------------- > > Key: LBCORE-23 > URL: http://jira.qos.ch/browse/LBCORE-23 > Project: logback-core > Issue Type: Bug > Components: Pattern > Affects Versions: unspecified > Environment: Operating System: All > Platform: All > Reporter: Jens Elkner > Assignee: Logback dev list > Priority: Blocker > Fix For: 0.9.10 > > > The Parser skips everything after incl. ')'. Try e.g. > <Pattern>%date{HH:mm:ss,SSS} [%thread] %-5level (%file:%line) - %message%n</Pattern> > and thus is completely useless. > Bummer! -- 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

svn commit: r1838 - logback/trunk/logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 21:20:08 2008 New Revision: 1838 Modified: logback/trunk/logback-site/src/site/pages/manual/layouts.html Log: LBCORE-23 Improvements to the section regarding parentheses in PatternLayout Modified: logback/trunk/logback-site/src/site/pages/manual/layouts.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/layouts.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/layouts.html Wed Oct 15 21:20:08 2008 @@ -361,13 +361,13 @@ In PatternLayout, parenthesis can be used to group conversion - patterns. It follows that the '(' and ')' carry special meaning - and need to be escaped to be used as literals. Parentheses can - be escaped by preceding the the opening and closing parenthesis - by backslash, but since backslash itself carries special meaning - in Java, we need two backslahes, as in "\\(" and "\\)". In - practice however, only the opening parenthesis needs to be - escaped to be used as a literal. + patterns. It follows that the '(' and ')' carry special meaning + and need to be escaped to be used as literals. Parentheses + can be escaped by preceding the the opening and closing + parenthesis by backslash, but since backslash itself carries + special meaning in Java, we need two backslashes, as in "\\(" and + "\\)". Note that strictly speaking, only the closing parenthesis + needs to be escaped to be used as a literal. As mentionned previously, certain conversion specifiers can @@ -1055,7 +1055,7 @@ In logback, parentheses within the pattern string are treated as grouping tokens. Thus, it is possible to group a sub-pattern - and apply formatting directives to that sub-pattern. + and apply formatting directives on that sub-pattern. For example, the pattern @@ -1079,7 +1079,7 @@ 13:09:40 [btpool0-7] INFO c.q.l.d.prime.NumberCruncherImpl - Found factor 2 - with the "%-30()" grouping applied it would be + with the "%-30()" grouping it would be 13:09:30 [main] DEBUG c.q.logback.demo.ContextListener - Classload hashcode is 13995234 13:09:30 [main] DEBUG c.q.logback.demo.ContextListener - Initializing for ServletContext @@ -1095,9 +1095,12 @@ The latter form is more comfortable to read, especially for long log files. - If you need to treat the parenthesis character as a literal, it - needs to be escaped by preceding the parentheses with a - backslash. As in, \(%d{HH:mm:ss.SSS} [%thread]\). + If you need to treat the parenthesis character as a literal, + they needs to be escaped by preceding each parenthesis with a + backslash. As in, \(%d{HH:mm:ss.SSS} + [%thread]\). Strictly speaking, only the closing parentesis + needs to be escaped. Thus, "%d [%thread]\)" is + equivalent to "\(%d [%thread]\)".

1 0

svn commit: r1837 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 20:59:55 2008 New Revision: 1837 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java Log: - removing superfluous system.out.println statement Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java Wed Oct 15 20:59:55 2008 @@ -164,7 +164,6 @@ return cpd; } Class type = bestEffortLoadClass(lastExactClassLoader, className); - System.out.println("********** type is null for class "+className); String version = getImplementationVersion(type); String codeLocation = getCodeLocation(type); cpd = new ClassPackagingData(codeLocation, version, false);

1 0

svn commit: r1836 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 19:06:48 2008 New Revision: 1836 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java Log: Under certain special circumstances (reproducible under Continuum on Linux) the bestEffortLoadClass returns null. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java Wed Oct 15 19:06:48 2008 @@ -164,6 +164,7 @@ return cpd; } Class type = bestEffortLoadClass(lastExactClassLoader, className); + System.out.println("********** type is null for class "+className); String version = getImplementationVersion(type); String codeLocation = getCodeLocation(type); cpd = new ClassPackagingData(codeLocation, version, false); @@ -172,6 +173,9 @@ } String getImplementationVersion(Class type) { + if(type == null) { + return "na"; + } Package aPackage = type.getPackage(); if (aPackage != null) { String v = aPackage.getImplementationVersion(); @@ -238,8 +242,8 @@ /** * - * @param lastGuaranteedClassLoader - * may be null + * @param lastGuaranteedClassLoader may be null + * * @param className * @return */

1 0

svn commit: r1835 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 18:58:23 2008 New Revision: 1835 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java Log: Under certain special circumstances (reproducible under Continuum on Linux) the callerClass computed by R.getCaller class can be null. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java Wed Oct 15 18:58:23 2008 @@ -10,7 +10,6 @@ package ch.qos.logback.classic.spi; import java.net.URL; -import java.util.Arrays; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -83,23 +82,10 @@ callerClass = Reflection.getCallerClass(localFirstCommon + i - missfireCount + 1); } - - - StackTraceElementProxy step = stepArray[stepFirstCommon + i]; String stepClassname = step.ste.getClassName(); - if (callerClass == null) { - System.out.println("***********************************"); - System.out.println("localFirstCommon=" + localFirstCommon + ", i=" + i - + ", missfireCount=" + missfireCount); - System.out.println("sum=" + (localFirstCommon + i - missfireCount + 1)); - System.out.println("stepClassname="+stepClassname); - t.printStackTrace(); - System.out.println(Arrays.toString(stepArray)); - } - - if (stepClassname.equals(callerClass.getName())) { + if (callerClass != null && stepClassname.equals(callerClass.getName())) { lastExactClassLoader = callerClass.getClassLoader(); if (firsExactClassLoader == null) { firsExactClassLoader = callerClass.getClassLoader();

1 0

svn commit: r1834 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 18:25:12 2008 New Revision: 1834 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java Log: hunting down the circumstances for NullPointerExcetions thrown in PackagingDataCalculator Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java Wed Oct 15 18:25:12 2008 @@ -10,6 +10,7 @@ package ch.qos.logback.classic.spi; import java.net.URL; +import java.util.Arrays; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -31,7 +32,7 @@ HashMap<String, ClassPackagingData> cache = new HashMap<String, ClassPackagingData>(); private static boolean GET_CALLER_CLASS_METHOD_AVAILABLE = false; - + static { // if either the Reflection class or the getCallerClass method // are unavailable, then we won't invoke Reflection.getCallerClass() @@ -41,29 +42,29 @@ try { Reflection.getCallerClass(2); GET_CALLER_CLASS_METHOD_AVAILABLE = true; - } catch(NoClassDefFoundError e) { - } catch(NoSuchMethodError e) { - } catch(Throwable e) { + } catch (NoClassDefFoundError e) { + } catch (NoSuchMethodError e) { + } catch (Throwable e) { System.err.println("Unexpected exception"); e.printStackTrace(); } } - + public PackagingDataCalculator() { } public void calculate(ThrowableDataPoint[] tdpArray) { int steStart = 0; StackTraceElementProxy[] stepArray = new StackTraceElementProxy[0]; - do { - steStart = findSTEStartIndex(tdpArray, steStart+stepArray.length); + do { + steStart = findSTEStartIndex(tdpArray, steStart + stepArray.length); stepArray = getSTEPArray(tdpArray, steStart); populateFrames(stepArray); - } while(steStart != -1); + } while (steStart != -1); } void populateFrames(StackTraceElementProxy[] stepArray) { - // in the initial part of this method we populate package informnation for + // in the initial part of this method we populate package informnation for // common stack frames final Throwable t = new Throwable("local stack reference"); final StackTraceElement[] localteSTEArray = t.getStackTrace(); @@ -74,20 +75,33 @@ ClassLoader lastExactClassLoader = null; ClassLoader firsExactClassLoader = null; - + int missfireCount = 0; for (int i = 0; i < commonFrames; i++) { Class callerClass = null; - if(GET_CALLER_CLASS_METHOD_AVAILABLE) { + if (GET_CALLER_CLASS_METHOD_AVAILABLE) { callerClass = Reflection.getCallerClass(localFirstCommon + i - - missfireCount + 1); + - missfireCount + 1); } + + + StackTraceElementProxy step = stepArray[stepFirstCommon + i]; String stepClassname = step.ste.getClassName(); + + if (callerClass == null) { + System.out.println("***********************************"); + System.out.println("localFirstCommon=" + localFirstCommon + ", i=" + i + + ", missfireCount=" + missfireCount); + System.out.println("sum=" + (localFirstCommon + i - missfireCount + 1)); + System.out.println("stepClassname="+stepClassname); + t.printStackTrace(); + System.out.println(Arrays.toString(stepArray)); + } if (stepClassname.equals(callerClass.getName())) { lastExactClassLoader = callerClass.getClassLoader(); - if(firsExactClassLoader == null) { + if (firsExactClassLoader == null) { firsExactClassLoader = callerClass.getClassLoader(); } ClassPackagingData pi = calculateByExactType(callerClass); @@ -113,8 +127,9 @@ } return -1; } - - private StackTraceElementProxy[] getSTEPArray(final ThrowableDataPoint[] tdpArray, final int from) { + + private StackTraceElementProxy[] getSTEPArray( + final ThrowableDataPoint[] tdpArray, final int from) { List<StackTraceElementProxy> stepList = new LinkedList<StackTraceElementProxy>(); int len = tdpArray.length; if (from < 0 || from >= len) { @@ -131,9 +146,10 @@ } return stepList.toArray(STEP_ARRAY_TEMPLATE); } - - void populateUncommonFrames(int commonFrames, StackTraceElementProxy[] stepArray, ClassLoader firstExactClassLoader) { - int uncommonFrames = stepArray.length-commonFrames; + + void populateUncommonFrames(int commonFrames, + StackTraceElementProxy[] stepArray, ClassLoader firstExactClassLoader) { + int uncommonFrames = stepArray.length - commonFrames; for (int i = 0; i < uncommonFrames; i++) { StackTraceElementProxy step = stepArray[i]; ClassPackagingData pi = computeBySTEP(step, firstExactClassLoader); @@ -154,7 +170,8 @@ return cpd; } - private ClassPackagingData computeBySTEP(StackTraceElementProxy step, ClassLoader lastExactClassLoader) { + private ClassPackagingData computeBySTEP(StackTraceElementProxy step, + ClassLoader lastExactClassLoader) { String className = step.ste.getClassName(); ClassPackagingData cpd = cache.get(className); if (cpd != null) { @@ -167,8 +184,7 @@ cache.put(className, cpd); return cpd; } - - + String getImplementationVersion(Class type) { Package aPackage = type.getPackage(); if (aPackage != null) { @@ -192,7 +208,7 @@ String locationStr = resource.toString(); // now lets remove all but the file name String result = getCodeLocation(locationStr, '/'); - if(result != null) { + if (result != null) { return result; } return getCodeLocation(locationStr, '\\'); @@ -203,13 +219,12 @@ } return "na"; } - private String getCodeLocation(String locationStr, char separator) { int idx = locationStr.lastIndexOf(separator); - if(isFolder(idx, locationStr)) { - idx = locationStr.lastIndexOf(separator, idx-1); - return locationStr.substring(idx+1); + if (isFolder(idx, locationStr)) { + idx = locationStr.lastIndexOf(separator, idx - 1); + return locationStr.substring(idx + 1); } else if (idx > 0) { return locationStr.substring(idx + 1); } @@ -217,48 +232,50 @@ } private boolean isFolder(int idx, String text) { - return (idx != -1 && idx+1 == text.length()); + return (idx != -1 && idx + 1 == text.length()); } - + private Class loadClass(ClassLoader cl, String className) { - if(cl == null) { + if (cl == null) { return null; } try { return cl.loadClass(className); } catch (ClassNotFoundException e1) { return null; - } catch(Exception e) { + } catch (Exception e) { e.printStackTrace(); // this is unexpected return null; } - + } - + /** * - * @param lastGuaranteedClassLoader may be null + * @param lastGuaranteedClassLoader + * may be null * @param className * @return */ - private Class bestEffortLoadClass(ClassLoader lastGuaranteedClassLoader, String className) { + private Class bestEffortLoadClass(ClassLoader lastGuaranteedClassLoader, + String className) { Class result = loadClass(lastGuaranteedClassLoader, className); - if(result != null) { + if (result != null) { return result; } ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - if(tccl != lastGuaranteedClassLoader) { + if (tccl != lastGuaranteedClassLoader) { result = loadClass(tccl, className); } - if(result != null) { + if (result != null) { return result; } - + try { return Class.forName(className); } catch (ClassNotFoundException e1) { return null; - } catch(Exception e) { + } catch (Exception e) { e.printStackTrace(); // this is unexpected return null; }

1 0

svn commit: r1833 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 17:39:29 2008 New Revision: 1833 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java Log: Better error reporting during the creation of Converter from the custom converter registry Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java Wed Oct 15 17:39:29 2008 @@ -19,14 +19,13 @@ import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.util.OptionHelper; - class Compiler<E> extends ContextAwareBase { Converter<E> head; Converter<E> tail; final Node top; final Map converterMap; - + Compiler(final Node top, final Map converterMap) { this.top = top; this.converterMap = converterMap; @@ -43,7 +42,8 @@ CompositeNode cn = (CompositeNode) n; CompositeConverter<E> compositeConverter = new CompositeConverter<E>(); compositeConverter.setFormattingInfo(cn.getFormatInfo()); - Compiler<E> childCompiler = new Compiler<E>(cn.getChildNode(), converterMap); + Compiler<E> childCompiler = new Compiler<E>(cn.getChildNode(), + converterMap); childCompiler.setContext(context); Converter<E> childConverter = childCompiler.compile(); compositeConverter.setChildConverter(childConverter); @@ -61,7 +61,8 @@ // it with a dummy LiteralConverter indicating an error. Converter<E> errConveter = new LiteralConverter<E>("%PARSER_ERROR_" + kn.getValue()); - addStatus(new ErrorStatus("["+kn.getValue()+"] is not a valid conversion word", this)); + addStatus(new ErrorStatus("[" + kn.getValue() + + "] is not a valid conversion word", this)); addToList(errConveter); } @@ -79,9 +80,10 @@ } } - /** - * Attempt to create a converter using the information found in 'converterMap'. + * Attempt to create a converter using the information found in + * 'converterMap'. + * * @param kn * @return */ @@ -90,26 +92,29 @@ String keyword = (String) kn.getValue(); String converterClassStr = (String) converterMap.get(keyword); - // FIXME: Better error handling if (converterClassStr != null) { try { return (DynamicConverter) OptionHelper.instantiateByClassName( converterClassStr, DynamicConverter.class, context); } catch (Exception e) { + addError("Failed to instantiate converter class [" + converterClassStr + + "]", e); return null; } } else { + addError("There is no conversion class registered for conversion word [" + + keyword + "]"); return null; } } -// public void setStatusManager(StatusManager statusManager) { -// this.statusManager = statusManager; -// } -// -// void addStatus(Status status) { -// if(statusManager != null) { -// statusManager.add(status); -// } -// } + // public void setStatusManager(StatusManager statusManager) { + // this.statusManager = statusManager; + // } + // + // void addStatus(Status status) { + // if(statusManager != null) { + // statusManager.add(status); + // } + // } } \ No newline at end of file

1 0

svn commit: r1832 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 17:33:04 2008 New Revision: 1832 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java Log: - generate a status entry when a conversion word is registered Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java Wed Oct 15 17:33:04 2008 @@ -56,19 +56,14 @@ } try { - //getLogger().debug( - // "About to add conversion rule [{}, {}] to layout", conversionWord, converterClass); - - //LoggerRepository repository = (LoggerRepository) ec.getObjectStack().get(0); - Map<String, String> ruleRegistry = (Map) context.getObject(CoreGlobal.PATTERN_RULE_REGISTRY); if(ruleRegistry == null) { ruleRegistry = new HashMap<String, String>(); context.putObject(CoreGlobal.PATTERN_RULE_REGISTRY, ruleRegistry); } // put the new rule into the rule registry + addInfo("registering conversion word "+conversionWord+" with class ["+converterClass+"]"); ruleRegistry.put(conversionWord, converterClass); - } catch (Exception oops) { inError = true; errorMsg = "Could not add conversion rule to PatternLayout.";

1 0