- logback-dev - mailman3.qos.ch

svn commit: r1648 - logback/trunk/logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 19 Mar '08

19 Mar '08

Author: ceki Date: Wed Mar 19 16:03:53 2008 New Revision: 1648 Modified: logback/trunk/logback-site/src/site/pages/manual/layouts.html Log: - added blurb on parentheses in layout patterns 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 Mar 19 16:03:53 2008 @@ -1000,14 +1000,52 @@ <h3>Parentheses are special</h3> - In logback, parentheses withing the pattern string are treated + 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. - For example, + For example, the pattern - XXXXXXXXXXXXXXXXXX + %-30(%d{HH:mm:ss.SSS} [%thread]) %-5level %logger{32} - %msg%n + + will group the output generated by the sub-pattern + "%d{HH:mm:ss.SSS} [%thread]" so that it is right-padded if less + than 30 characters. + + + If without the grouping the output was + + 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 +13:09:30 [main] DEBUG c.q.logback.demo.ContextListener - Trying platform Mbean server +13:09:30 [pool-1-thread-1] INFO ch.qos.logback.demo.LoggingTask - Howdydy-diddly-ho - 0 +13:09:38 [btpool0-7] INFO c.q.l.demo.lottery.LotteryAction - Number: 50 was tried. +13:09:40 [btpool0-7] INFO c.q.l.d.prime.NumberCruncherImpl - Beginning to factor. +13:09:40 [btpool0-7] DEBUG c.q.l.d.prime.NumberCruncherImpl - Trying 2 as a factor. +13:09:40 [btpool0-7] INFO c.q.l.d.prime.NumberCruncherImpl - Found factor 2 + + + with the "%-30()" grouping applied 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 +13:09:30 [main] DEBUG c.q.logback.demo.ContextListener - Trying platform Mbean server +13:09:30 [pool-1-thread-1] INFO ch.qos.logback.demo.LoggingTask - Howdydy-diddly-ho - 0 +13:09:38 [btpool0-7] INFO c.q.l.demo.lottery.LotteryAction - Number: 50 was tried. +13:09:40 [btpool0-7] INFO c.q.l.d.prime.NumberCruncherImpl - Beginning to factor. +13:09:40 [btpool0-7] DEBUG c.q.l.d.prime.NumberCruncherImpl - Trying 2 as a factor. +13:09:40 [btpool0-7] INFO c.q.l.d.prime.NumberCruncherImpl - Found factor 2 + + + + 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]\). +

1 0

svn commit: r1647 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern
by noreply.ceki＠qos.ch 19 Mar '08

19 Mar '08

Author: ceki Date: Wed Mar 19 13:19:48 2008 New Revision: 1647 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/ConverterUtil.java Log: - missing file Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/ConverterUtil.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/ConverterUtil.java Wed Mar 19 13:19:48 2008 @@ -0,0 +1,34 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 1999-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.pattern; + +public class ConverterUtil { + + /** + * Start converters in the chain of converters. + * @param head + */ + public static void startConverters(Converter head) { + Converter c = head; + while (c != null) { + if (c instanceof DynamicConverter) { + DynamicConverter dc = (DynamicConverter) c; + dc.start(); + } else if(c instanceof CompositeConverter){ + CompositeConverter cc = (CompositeConverter) c; + Converter childConverter = cc.childConverter; + startConverters(childConverter); + } + c = c.getNext(); + } + } + +}

1 0

svn commit: r1646 - in logback/trunk: logback-classic/src/test/java/ch/qos/logback/classic logback-core/src/main/java/ch/qos/logback/core/html logback-core/src/main/java/ch/qos/logback/core/pattern logback-core/src/main/java/ch/qos/logback/core/rolling/helper
by noreply.ceki＠qos.ch 18 Mar '08

18 Mar '08

Author: ceki Date: Tue Mar 18 22:10:40 2008 New Revision: 1646 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/DynamicConverter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java Log: - composite patterns (those with parentheses) pass initial tests - startConverters method moved from DynamicConverter to ConvertUtil class. In fact, CompositeConverter have to be started as well. This was previously not the case and patterns with composites in them would not work. Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java Tue Mar 18 22:10:40 2008 @@ -78,6 +78,20 @@ assertTrue(val.contains("java.lang.Exception: Bogus exception")); } + public void testCompositePattern() { + PatternLayout pl = new PatternLayout(); + pl.setPattern("%-56(%d [%t] %lo{20}) - %m%n"); + Context context = new LoggerContext(); + pl.setContext(context); + pl.start(); + String val = pl.doLayout(getEventObject()); + // 2008-03-18 21:55:54,250 [main] c.q.l.c.pattern.ConverterTest - Some message + String regex = Contants4T.ISO_REGEX+" \\[main] c.q.l.c.p.ConverterTest - Some message\\s*"; + System.out.println(val); + assertTrue(val.matches(regex)); + + } + public void testNopExeptionHandler() { PatternLayout pl = new PatternLayout(); pl.setPattern("%nopex %m%n"); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java Tue Mar 18 22:10:40 2008 @@ -4,7 +4,7 @@ import ch.qos.logback.core.LayoutBase; import ch.qos.logback.core.pattern.Converter; -import ch.qos.logback.core.pattern.DynamicConverter; +import ch.qos.logback.core.pattern.ConverterUtil; import ch.qos.logback.core.pattern.parser.Node; import ch.qos.logback.core.pattern.parser.Parser; import ch.qos.logback.core.pattern.parser.ScanException; @@ -74,7 +74,7 @@ p.setContext(getContext()); Node t = p.parse(); this.head = p.compile(t, getDefaultConverterMap()); - DynamicConverter.startConverters(this.head); + ConverterUtil.startConverters(this.head); } catch (ScanException ex) { addError("Incorrect pattern found", ex); errorCount++; Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/DynamicConverter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/DynamicConverter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/DynamicConverter.java Tue Mar 18 22:10:40 2008 @@ -52,19 +52,4 @@ protected List getOptionList() { return optionList; } - - /** - * Used to start DynamicConvertes in a chain of converters. - * @param head - */ - public static void startConverters(Converter head) { - Converter c = head; - while (c != null) { - if (c instanceof DynamicConverter) { - DynamicConverter dc = (DynamicConverter) c; - dc.start(); - } - c = c.getNext(); - } - } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java Tue Mar 18 22:10:40 2008 @@ -78,7 +78,7 @@ Node t = p.parse(); this.head = p.compile(t, getEffectiveConverterMap()); postCompileProcessing(head); - DynamicConverter.startConverters(this.head); + ConverterUtil.startConverters(this.head); super.start(); } catch (ScanException sce) { StatusManager sm = getContext().getStatusManager(); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java Tue Mar 18 22:10:40 2008 @@ -16,7 +16,7 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.pattern.Converter; -import ch.qos.logback.core.pattern.DynamicConverter; +import ch.qos.logback.core.pattern.ConverterUtil; import ch.qos.logback.core.pattern.parser.Node; import ch.qos.logback.core.pattern.parser.Parser; import ch.qos.logback.core.pattern.parser.ScanException; @@ -47,7 +47,7 @@ setPattern(patternArg); setContext(contextArg); parse(); - DynamicConverter.startConverters(this.headTokenConverter); + ConverterUtil.startConverters(this.headTokenConverter); } void parse() {

1 0

svn commit: r1645 - in logback/trunk: logback-core/src/test/java/ch/qos/logback/core/pattern/parser logback-site/src/site/pages logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 13 Mar '08

13 Mar '08

Author: ceki Date: Thu Mar 13 17:55:08 2008 New Revision: 1645 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/TokenStreamTest.java logback/trunk/logback-site/src/site/pages/manual/layouts.html logback/trunk/logback-site/src/site/pages/news.html Log: - documenting and further testing parentheses support (bug 83) - updating news 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 Thu Mar 13 17:55:08 2008 @@ -42,9 +42,25 @@ //StatusManager sm = context.getStatusManager(); //StatusPrinter.print(sm); assertEquals("x123", s); + } + + public void testParentheses() { + PatternLayoutBase<Object> plb = getPatternLayoutBase(); + Context context = new ContextBase(); + plb.setContext(context); + plb.setPattern("x(%OTT\\)"); + plb.start(); + String s = plb.doLayout(new Object()); + //System.out.println(s); + System.out.println(s); + + //StatusManager sm = context.getStatusManager(); + //StatusPrinter.print(sm); + assertEquals("x(123)", s); } + @Override public Context getContext() { return context; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java Thu Mar 13 17:55:08 2008 @@ -281,35 +281,42 @@ } public void testNested() throws ScanException { + List tl = new TokenStream("%(%a%(%b))").tokenize(); + List<Token> witness = new ArrayList<Token>(); + witness.add(Token.PERCENT_TOKEN); + witness.add(Token.LEFT_PARENTHESIS_TOKEN); + witness.add(Token.PERCENT_TOKEN); + witness.add(new Token(Token.KEYWORD, "a")); + witness.add(Token.PERCENT_TOKEN); + witness.add(Token.LEFT_PARENTHESIS_TOKEN); + witness.add(Token.PERCENT_TOKEN); + witness.add(new Token(Token.KEYWORD, "b")); + witness.add(Token.RIGHT_PARENTHESIS_TOKEN); + witness.add(Token.RIGHT_PARENTHESIS_TOKEN); + + assertEquals(witness, tl); + + } + + public void testEscapedParanteheses() throws ScanException { { - List tl = new TokenStream("%(%a%(%b))").tokenize(); + List tl = new TokenStream("\\(%h\\)").tokenize(); List<Token> witness = new ArrayList<Token>(); + witness.add(new Token(Token.LITERAL, "(")); witness.add(Token.PERCENT_TOKEN); - witness.add(Token.LEFT_PARENTHESIS_TOKEN); - witness.add(Token.PERCENT_TOKEN); - witness.add(new Token(Token.KEYWORD, "a")); - witness.add(Token.PERCENT_TOKEN); - witness.add(Token.LEFT_PARENTHESIS_TOKEN); - witness.add(Token.PERCENT_TOKEN); - witness.add(new Token(Token.KEYWORD, "b")); - witness.add(Token.RIGHT_PARENTHESIS_TOKEN); - witness.add(Token.RIGHT_PARENTHESIS_TOKEN); - + witness.add(new Token(Token.KEYWORD, "h")); + witness.add(new Token(Token.LITERAL, ")")); assertEquals(witness, tl); } - { - List tl = new TokenStream("\\(%h\\)").tokenize(); + List tl = new TokenStream("(%h\\)").tokenize(); List<Token> witness = new ArrayList<Token>(); witness.add(new Token(Token.LITERAL, "(")); witness.add(Token.PERCENT_TOKEN); witness.add(new Token(Token.KEYWORD, "h")); witness.add(new Token(Token.LITERAL, ")")); - assertEquals(witness, tl); } - // } - } \ No newline at end of file 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 Thu Mar 13 17:55:08 2008 @@ -998,6 +998,19 @@ </tr> </table> + <h3>Parentheses are special</h3> + + In logback, parentheses withing 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. + + + For example, + + XXXXXXXXXXXXXXXXXX + + + <h3>Options</h3> Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Thu Mar 13 17:55:08 2008 @@ -60,8 +60,6 @@ client connections and to close them. - - Fixed <a href="http://bugzilla.qos.ch/show_bug.cgi?id=110">bug 110</a> in relation with the <code>requestParameterMap</code> field in <code>AccessEvent</code> - reported by Joern Huxhorn. @@ -77,6 +75,20 @@ nested as well as multiple file inclusions. + Fixed <a href="http://bugzilla.qos.ch/show_bug.cgi?id=100">bug + 100</a> reported by Joern Huxhorn. At serialization time, object + array passed as parameter, when the LoggingEvent is are now + serialized as strings. + + + + Fixed <a href="http://bugzilla.qos.ch/show_bug.cgi?id=109">bug + 109</a> reported by Joern Huxhorn. There should no longer be any + NullPointerExceptions thrown by deserialized + <code>AccessEvent</code> instances. + + + <hr width="80%" align="center" />

1 0

[Bug 136] New: ThrowableInformation should keep the Throwable cause hierarchy intact.
by bugzilla-daemon＠pixie.qos.ch 13 Mar '08

13 Mar '08

http://bugzilla.qos.ch/show_bug.cgi?id=136 Summary: ThrowableInformation should keep the Throwable cause hierarchy intact. Product: logback-classic Version: unspecified Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: joern(a)huxhorn.de Instead of a String representation of the whole Throwable stack trace incl. cause ThrowableInformation should instead look like this: public class ThrowableInformation implements Serializable { String throwableClassName; String message; StackTraceElement[] stackTrace; ThrowableInformation cause; } I omitted get/set and private in this example. StackTraceElement is perfectly Serializable and did also receive a public c'tor in Java 5 so I guess that the current ThrowableInformation is more or less a relict of log4j which had to stay compatible with older Java versions. You could obviously keep the getThrowableStrRep() method for compatibility. This bug is somewhat related to bug #134 because I think that ThrowableInformation should also, as LoggingEvent, be just a dumb data container with no real logic. The logic to extract the relevant StackTraceElements should IMHO be moved either into Logger or into a static factory method of ThrowableInformation. -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 1

[Bug 83] New: Parser stops at ')'
by bugzilla-daemon＠pixie.qos.ch 13 Mar '08

13 Mar '08

http://bugzilla.qos.ch/show_bug.cgi?id=83 Summary: Parser stops at ')' Product: logback-core Version: unspecified Platform: All OS/Version: All Status: NEW Severity: blocker Priority: P1 Component: Pattern AssignedTo: logback-dev(a)qos.ch ReportedBy: jel(a)linofee.org 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! -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 1

svn commit: r1644 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/spi test/java/ch/qos/logback/classic/spi
by noreply.ceki＠qos.ch 13 Mar '08

13 Mar '08

Author: ceki Date: Thu Mar 13 17:09:56 2008 New Revision: 1644 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java Log: - support strings of unlimited length Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java Thu Mar 13 17:09:56 2008 @@ -42,17 +42,11 @@ */ public class LoggingEvent implements Serializable { - /** - * - */ - private static final long serialVersionUID = 3022264832697160750L; + private static final long serialVersionUID = 3075964498087694229L; private static final int NULL_ARGUMENT_ARRAY = -1; private static final String NULL_ARGUMENT_ARRAY_ELEMENT = "NULL_ARGUMENT_ARRAY_ELEMENT"; - // writeUTF method in ObjectOutputStream has a size limit of 2*16; - static final int UTF_SIZE_LIMIT = 0xFFFF; - /** * */ @@ -298,9 +292,9 @@ out.writeInt(len); for (int i = 0; i < argumentArray.length; i++) { if (argumentArray[i] != null) { - out.writeUTF(cap(argumentArray[i].toString())); + out.writeObject(argumentArray[i].toString()); } else { - out.writeUTF(NULL_ARGUMENT_ARRAY_ELEMENT); + out.writeObject(NULL_ARGUMENT_ARRAY_ELEMENT); } } } else { @@ -309,18 +303,6 @@ } - /** - * writeUTF method cannot handle large strings - * @param in - * @return - */ - final String cap(String in) { - if(in.length() > UTF_SIZE_LIMIT) { - return in.substring(0, UTF_SIZE_LIMIT); - } else { - return in; - } - } private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); @@ -331,7 +313,7 @@ if (argArrayLen != NULL_ARGUMENT_ARRAY) { argumentArray = new String[argArrayLen]; for (int i = 0; i < argArrayLen; i++) { - String val = in.readUTF(); + Object val = in.readObject(); if (!NULL_ARGUMENT_ARRAY_ELEMENT.equals(val)) { argumentArray[i] = val; } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java Thu Mar 13 17:09:56 2008 @@ -3,7 +3,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -154,9 +153,7 @@ assertNotNull(aa); assertEquals(2, aa.length); String stringBack = (String) aa[1]; - - assertTrue(stringBack.startsWith("X")); - assertEquals(LoggingEvent.UTF_SIZE_LIMIT, stringBack.length()); + assertEquals(largeString, stringBack); } private LoggingEvent createLoggingEvent() {

1 0

[Bug 109] New: NullPointerException in deserialized AccessEvent.
by bugzilla-daemon＠pixie.qos.ch 13 Mar '08

13 Mar '08

http://bugzilla.qos.ch/show_bug.cgi?id=109 Summary: NullPointerException in deserialized AccessEvent. Product: logback-access Version: unspecified Platform: All OS/Version: Windows Status: NEW Severity: major Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: joern(a)huxhorn.de The following methods throw NPE's in case of deserialized AccessEvents. They should instead retun null. getRequestHeaderNames() buildRequestHeaderMap() buildRequestParameterMap() getResponseHeader(String key) getResponseHeaderNameList() getRequestContent() getStatusCode() (possibly, wrong if condition) getContentLength() (possibly, wrong if condition) getResponseContent() (please check) -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 14

svn commit: r1643 - in logback/trunk/logback-access/src: main/java/ch/qos/logback/access/spi test/java/ch/qos/logback/access/dummy test/java/ch/qos/logback/access/spi
by noreply.ceki＠qos.ch 13 Mar '08

13 Mar '08

Author: ceki Date: Thu Mar 13 03:59:18 2008 New Revision: 1643 Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/spi/AccessEventSerializationTest.java - copied, changed from r1629, /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/spi/AccessEventTest.java Removed: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/spi/AccessEventTest.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/spi/PackageTest.java Log: - fixing remaining issues with bug 109, in particular NPE thrown for getRequestContent and getResponseContent after serialization. The idea is, as expalined in comment 3, to make a copy of the contents of various httpRequest and httpResponse fields (without serializing httpRequest and httpResponse). Also note many converters in the c.q.l.acces.Pattern package *cannot* deal with null values returned by various get methods in AccessEvent. Thus, it is not enough to avoid NPE as accomplished by attachment 21 (dated 2008-01-28 21:39:11) but also to return valid values. Comment 3: http://bugzilla.qos.ch/show_bug.cgi?id=109#c3 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java Thu Mar 13 03:59:18 2008 @@ -29,8 +29,9 @@ */ public class AccessEvent implements Serializable { - private static final long serialVersionUID = -3118194368414470960L; - + + private static final long serialVersionUID = 866718993618836343L; + public final static String NA = "-"; public final static String[] NA_STRING_ARRAY = new String[] { AccessEvent.NA }; @@ -75,10 +76,22 @@ this.serverAdapter = adapter; } + /** + * Returns the underlying HttpServletRequest. After serialization the returned + * value will be null. + * + * @return + */ public HttpServletRequest getRequest() { return httpRequest; } + /** + * Returns the underlying HttpServletResponse. After serialization the returned + * value will be null. + * + * @return + */ public HttpServletResponse getResponse() { return httpResponse; } @@ -462,6 +475,7 @@ getStatusCode(); getContentLength(); - // getPostContent(); + getRequestContent(); + getResponseContent(); } } \ No newline at end of file Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java Thu Mar 13 03:59:18 2008 @@ -15,8 +15,17 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import ch.qos.logback.access.Constants; + public class DummyRequest implements HttpServletRequest { + public final static String DUMMY_CONTENT_STRING = "request contents"; + public final static byte[] DUMMY_CONTENT_BYTES = DUMMY_CONTENT_STRING.getBytes(); + + + public static final String DUMMY_RESPONSE_CONTENT_STRING = "response contents"; + public static final byte[] DUMMY_RESPONSE_CONTENT_BYTES =DUMMY_RESPONSE_CONTENT_STRING.getBytes(); + Hashtable<String, String> headerNames; String uri; @@ -130,6 +139,10 @@ public Object getAttribute(String key) { if (key.equals("testKey")) { return "testKey"; + } else if (Constants.LB_INPUT_BUFFER.equals(key)) { + return DUMMY_CONTENT_BYTES; + } else if (Constants.LB_OUTPUT_BUFFER.equals(key)) { + return DUMMY_RESPONSE_CONTENT_BYTES; } else { return null; } Copied: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/spi/AccessEventSerializationTest.java (from r1629, /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/spi/AccessEventTest.java) ============================================================================== --- /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/spi/AccessEventTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/spi/AccessEventSerializationTest.java Thu Mar 13 03:59:18 2008 @@ -1,16 +1,21 @@ package ch.qos.logback.access.spi; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import junit.framework.TestCase; +import org.junit.Test; + import ch.qos.logback.access.dummy.DummyAccessEventBuilder; +import ch.qos.logback.access.dummy.DummyRequest; import ch.qos.logback.access.dummy.DummyResponse; -public class AccessEventTest extends TestCase { +public class AccessEventSerializationTest { private Object buildSerializedAccessEvent() throws IOException, ClassNotFoundException { @@ -28,11 +33,13 @@ return ois.readObject(); } + @Test public void testSerialization() throws IOException, ClassNotFoundException { Object o = buildSerializedAccessEvent(); assertNotNull(o); AccessEvent aeBack = (AccessEvent) o; + assertEquals(DummyResponse.DUMMY_DEFAULT_HDEADER_MAP, aeBack .getResponseHeaderMap()); assertEquals(DummyResponse.DUMMY_DEFAULT_HDEADER_MAP.get("x"), aeBack @@ -45,6 +52,12 @@ .getContentLength()); assertEquals(DummyResponse.DUMMY_DEFAULT_STATUS, aeBack.getStatusCode()); + assertEquals(DummyRequest.DUMMY_CONTENT_STRING, aeBack + .getRequestContent()); + + assertEquals(DummyRequest.DUMMY_RESPONSE_CONTENT_STRING, aeBack + .getResponseContent()); + } } Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/spi/PackageTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/spi/PackageTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/spi/PackageTest.java Thu Mar 13 03:59:18 2008 @@ -15,7 +15,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTestSuite(AccessEventTest.class); + suite.addTest(new JUnit4TestAdapter(AccessEventSerializationTest.class)); return suite; } } \ No newline at end of file

1 0

[Bug 118] New: Console appender stops working after using paramter logging
by bugzilla-daemon＠pixie.qos.ch 13 Mar '08

13 Mar '08

http://bugzilla.qos.ch/show_bug.cgi?id=118 Summary: Console appender stops working after using paramter logging Product: Console Plugin Version: unspecified Platform: PC OS/Version: Windows Status: NEW Severity: critical Priority: P1 Component: interface AssignedTo: logback-dev(a)qos.ch ReportedBy: graham(a)crazysquirrel.com I'm pretty new to LOGBack but I've come across what appears to be a fairly major failing in the Eclipse console plugin. The first time a parameter replacing log message is used the console plugin stops working and doesn't log any further messages. I haven't written a simplified test case yet but here are three lines from my code that reliably trigger the problem: //This line appears in the console pluging and the standard tomcat console logger.debug( "Loading foo: " + foo ); //Neither of these two lines appear in the console plugin but do appear in the //standard tomcat console logger.debug( "Loading foo {} bar {} for baz {}", new Object[]{ foo, bar, baz} ); logger.debug( "Loading bar: " + bar ); -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 8