- logback-dev - mailman3.qos.ch

[Bug 138] support looking up property files from classpath resources
by bugzilla-daemon＠pixie.qos.ch 19 May '08

19 May '08

show_bug.cgi?id=138 Eduardo Ito <ziba(a)summa-tech.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ziba(a)summa-tech.com --- Comment #1 from Eduardo Ito <ziba(a)summa-tech.com> 2008-05-19 22:10:20 --- That would be very useful. I was just trying to do this, when discovered that Logback can only read properties from the file system. Is it being considered for newer versions? -- Configure bugmail: userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 0

[Bug 107] Specificy the config file to use as a System property
by bugzilla-daemon＠pixie.qos.ch 15 May '08

15 May '08

show_bug.cgi?id=107 Ralph Goers <rgoers(a)apache.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |rgoers(a)apache.org --- Comment #6 from Ralph Goers <rgoers(a)apache.org> 2008-05-15 10:44:50 --- I also need this feature for a couple of reasons. 1. In production we would like to have a central file. This needs to be outside the deployment. Ideally a URL could be specified. 2. In unit testing we might want various logging configurations within one maven project. The simplest way to do that is to set a system property in the unit test. -- Configure bugmail: userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 0

svn commit: r1698 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch
by noreply.ceki＠qos.ch 14 May '08

14 May '08

Author: ceki Date: Wed May 14 19:05:57 2008 New Revision: 1698 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/Profiler.java Log: - the fact that the Profiler.start method returns void is one of the core features of the Profiler API Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/Profiler.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/Profiler.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/Profiler.java Wed May 14 19:05:57 2008 @@ -70,12 +70,11 @@ profilerRegistry.put(this); } - public StopWatch start(String name) { + public void start(String name) { stopLastStopWatch(); StopWatch childSW = new StopWatch(name); stopwatchList.add(childSW); childList.add(childSW); - return childSW; } public Profiler startNested(String name) {

1 0

svn commit: r1697 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch
by noreply.ceki＠qos.ch 14 May '08

14 May '08

Author: ceki Date: Wed May 14 19:02:03 2008 New Revision: 1697 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/Profiler.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/ProfilerRegistry.java Log: - minor improvements Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/Profiler.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/Profiler.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/Profiler.java Wed May 14 19:02:03 2008 @@ -16,10 +16,30 @@ // |-- elapsed time [doZ] 21 milliseconds. // |-- Total elapsed time [BAS] 78 milliseconds. +// + Profiler [TOP] +// |--+ Profiler [IIII] +// |-- elapsed time [A] 0.006 milliseconds. +// |-- elapsed time [B] 75.777 milliseconds. +// |-- elapsed time [VVVVVV] 161.589 milliseconds. +// |-- Total elapsed time [IIII] 240.580 milliseconds. +// |--+ Profiler [RRRRRRRRR] +// |-- elapsed time [R0] 9.390 milliseconds. +// |-- elapsed time [R1] 6.555 milliseconds. +// |-- elapsed time [R2] 5.995 milliseconds. +// |-- elapsed time [R3] 115.502 milliseconds. +// |-- elapsed time [R4] 0.064 milliseconds. +// |-- Total elapsed time [R] 138.340 milliseconds. +// |--+ Profiler [S] +// |-- Total elapsed time [S0] 3.091 milliseconds. +// |--+ Profiler [P] +// |-- elapsed time [P0] 87.550 milliseconds. +// |-- Total elapsed time [P] 87.559 milliseconds. +// |-- Total elapsed time [TOP] 467.548 milliseconds. + public class Profiler { - final static int MIN_SW_NAME_LENGTH = 12; - final static int MIN_SW_ELAPSED_TIME_NUMBER_LENGTH = 6; + final static int MIN_SW_NAME_LENGTH = 24; + final static int MIN_SW_ELAPSED_TIME_NUMBER_LENGTH = 9; final String name; final StopWatch globalStopWatch; @@ -33,20 +53,29 @@ this.name = name; this.globalStopWatch = new StopWatch(name); } + + public String getName() { + return name; + } public ProfilerRegistry getProfilerRegistry() { return profilerRegistry; } public void setProfilerRegistry(ProfilerRegistry profilerRegistry) { + if(profilerRegistry == null) { + return; + } this.profilerRegistry = profilerRegistry; + profilerRegistry.put(this); } - public void start(String name) { + public StopWatch start(String name) { stopLastStopWatch(); StopWatch childSW = new StopWatch(name); stopwatchList.add(childSW); childList.add(childSW); + return childSW; } public Profiler startNested(String name) { Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/ProfilerRegistry.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/ProfilerRegistry.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/ProfilerRegistry.java Wed May 14 19:02:03 2008 @@ -24,6 +24,10 @@ Map<String, Profiler> profilerMap = new HashMap<String, Profiler>(); + + public void put(Profiler profiler) { + put(profiler.getName(), profiler); + } public void put(String name, Profiler profiler) { profilerMap.put(name, profiler);

1 0

svn commit: r1696 - in logback/trunk/logback-core/src/main/java/ch/qos/logback/core: . helpers util
by noreply.ceki＠qos.ch 14 May '08

14 May '08

Author: ceki Date: Wed May 14 15:27:02 2008 New Revision: 1696 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/ThrowableToStringArray.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java Log: - refactoring of ThrowableInformation. Code responsible for extracting the string array has been moved into the ThorableToStringArray class. This allows StatusPrinter code (in lb-core) to compute string representation of throwables without creating a ThrowableInformationConverter (in lb-classic). Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreGlobal.java Wed May 14 15:27:02 2008 @@ -44,4 +44,5 @@ * An empty Class array. */ public final static Class[] EMPTY_CLASS_ARRAY = new Class[] {}; + static public final String CAUSED_BY = "Caused by: "; } Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/ThrowableToStringArray.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/ThrowableToStringArray.java Wed May 14 15:27:02 2008 @@ -0,0 +1,84 @@ +/** + * LOGBack: the reliable, fast and flexible logging library for Java. + * + * Copyright (C) 1999-2005, 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.helpers; + +import ch.qos.logback.core.CoreGlobal; + + +public class ThrowableToStringArray { + + public static String[] extractStringRep(Throwable t, StackTraceElement[] parentSTE) { + String[] result; + + StackTraceElement[] ste = t.getStackTrace(); + final int commonFrames = findCommonFrames(ste, parentSTE); + + final String[] firstArray; + if (commonFrames == 0) { + firstArray = new String[ste.length + 1]; + } else { + firstArray = new String[ste.length - commonFrames + 2]; + } + + String prefix = ""; + if (parentSTE != null) { + prefix = CoreGlobal.CAUSED_BY; + } + + firstArray[0] = prefix + t.getClass().getName(); + if (t.getMessage() != null) { + firstArray[0] += ": " + t.getMessage(); + } + + for (int i = 0; i < (ste.length - commonFrames); i++) { + firstArray[i + 1] = ste[i].toString(); + } + + if (commonFrames != 0) { + firstArray[firstArray.length - 1] = commonFrames + + " common frames omitted"; + } + + Throwable cause = t.getCause(); + if (cause != null) { + final String[] causeArray = ThrowableToStringArray.extractStringRep(cause, ste); + String[] tmp = new String[firstArray.length + causeArray.length]; + System.arraycopy(firstArray, 0, tmp, 0, firstArray.length); + System + .arraycopy(causeArray, 0, tmp, firstArray.length, causeArray.length); + result = tmp; + } else { + result = firstArray; + } + return result; + } + + private static int findCommonFrames(StackTraceElement[] ste, + StackTraceElement[] parentSTE) { + if (parentSTE == null) { + return 0; + } + + int steIndex = ste.length - 1; + int parentIndex = parentSTE.length - 1; + int count = 0; + while (steIndex >= 0 && parentIndex >= 0) { + if (ste[steIndex].equals(parentSTE[parentIndex])) { + count++; + } else { + break; + } + steIndex--; + parentIndex--; + } + return count; + } + +} Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java Wed May 14 15:27:02 2008 @@ -16,20 +16,23 @@ import java.util.Iterator; import ch.qos.logback.core.Context; +import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.Layout; import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusManager; +import ch.qos.logback.core.helpers.ThrowableToStringArray; public class StatusPrinter { - + private static PrintStream ps = System.out; - static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss,SSS"); - + static SimpleDateFormat simpleDateFormat = new SimpleDateFormat( + "HH:mm:ss,SSS"); + public static void setPrintStream(PrintStream printStream) { ps = printStream; } - + public static void print(Context context) { if (context == null) { throw new IllegalArgumentException("Context argument cannot be null"); @@ -46,53 +49,64 @@ } public static void print(StatusManager sm) { - StringBuilder sb = buildStr(sm); + StringBuilder sb = new StringBuilder(); + buildStr(sb, sm); ps.println(sb.toString()); } - public static StringBuilder buildStr(StatusManager sm) { - StringBuilder sb = new StringBuilder(); + public static void buildStr(StringBuilder sb, StatusManager sm) { + synchronized (sm) { Iterator it = sm.iterator(); while (it.hasNext()) { Status s = (Status) it.next(); buildStr(sb, "", s); } - return sb; } } - + private static void appendThrowable(StringBuilder sb, Throwable t) { - StackTraceElement[] steArray = t.getStackTrace(); - for (StackTraceElement ste : steArray) { - sb.append(ste.toString()).append(Layout.LINE_SEP); + String[] stringRep = ThrowableToStringArray.extractStringRep(t, null); + + for (String s : stringRep) { + if (s.startsWith(CoreGlobal.CAUSED_BY)) { + // nothing + } else if (Character.isDigit(s.charAt(0))) { + // if line resembles "48 common frames omitted" + sb.append("\t... "); + } else { + // most of the time. just add a tab+"at" + sb.append("\tat "); + } + sb.append(s).append(CoreGlobal.LINE_SEPARATOR); } } + private static void buildStr(StringBuilder sb, String indentation, Status s) { String prefix; - if(s.hasChildren()) { - prefix = indentation + "+ "; + if (s.hasChildren()) { + prefix = indentation + "+ "; } else { prefix = indentation + "|-"; } - - if(simpleDateFormat != null) { + + if (simpleDateFormat != null) { Date date = new Date(s.getDate()); String dateStr = simpleDateFormat.format(date); sb.append(dateStr).append(" "); - } - sb.append(prefix+s).append(Layout.LINE_SEP); - + } + sb.append(prefix + s).append(Layout.LINE_SEP); + if (s.getThrowable() != null) { appendThrowable(sb, s.getThrowable()); } - if(s.hasChildren()) { + if (s.hasChildren()) { Iterator<Status> ite = s.iterator(); - while(ite.hasNext()) { + while (ite.hasNext()) { Status child = ite.next(); - buildStr(sb, indentation+" ", child); + buildStr(sb, indentation + " ", child); } } } - + }

1 0

svn commit: r1695 - in logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic: . pattern spi
by noreply.ceki＠qos.ch 14 May '08

14 May '08

Author: ceki Date: Wed May 14 15:26:59 2008 New Revision: 1695 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/ClassicGlobal.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableInformation.java Log: - refactoring of ThrowableInformation. Code responsible for extracting the string array has been moved into the ThorableToStringArray class. This allows StatusPrinter code (in lb-core) to compute string representation of throwables without creating a ThrowableInformationConverter (in lb-classic). Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/ClassicGlobal.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/ClassicGlobal.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/ClassicGlobal.java Wed May 14 15:26:59 2008 @@ -11,7 +11,6 @@ public class ClassicGlobal { static public final char LOGGER_SEPARATOR = '.'; - static public final String CAUSED_BY = "Caused by: "; static public final char DOT = '.'; static public final String USER_MDC_KEY = "user"; Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableInformationConverter.java Wed May 14 15:26:59 2008 @@ -132,7 +132,7 @@ for (int i = 1; i < length; i++) { String string = stringRep[i]; - if (string.startsWith(ch.qos.logback.classic.ClassicGlobal.CAUSED_BY)) { + if (string.startsWith(CoreGlobal.CAUSED_BY)) { // nothing } else if (Character.isDigit(string.charAt(0))) { buf.append("\t... "); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableInformation.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableInformation.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableInformation.java Wed May 14 15:26:59 2008 @@ -11,7 +11,7 @@ import java.util.Arrays; -import ch.qos.logback.classic.ClassicGlobal; +import ch.qos.logback.core.helpers.ThrowableToStringArray; public class ThrowableInformation implements java.io.Serializable { @@ -21,80 +21,13 @@ public ThrowableInformation(Throwable throwable) { this.throwable = throwable; - sa = extractStringRep(throwable, null); + sa = ThrowableToStringArray.extractStringRep(throwable, null); } public Throwable getThrowable() { return throwable; } - public String[] extractStringRep(Throwable t, StackTraceElement[] parentSTE) { - String[] result; - - StackTraceElement[] ste = t.getStackTrace(); - final int commonFrames = findCommonFrames(ste, parentSTE); - - final String[] firstArray; - if (commonFrames == 0) { - firstArray = new String[ste.length + 1]; - } else { - firstArray = new String[ste.length - commonFrames + 2]; - } - - String prefix = ""; - if (parentSTE != null) { - prefix = ClassicGlobal.CAUSED_BY; - } - - firstArray[0] = prefix + t.getClass().getName(); - if (t.getMessage() != null) { - firstArray[0] += ": " + t.getMessage(); - } - - for (int i = 0; i < (ste.length - commonFrames); i++) { - firstArray[i + 1] = ste[i].toString(); - } - - if (commonFrames != 0) { - firstArray[firstArray.length - 1] = commonFrames - + " common frames omitted"; - } - - Throwable cause = t.getCause(); - if (cause != null) { - final String[] causeArray = extractStringRep(cause, ste); - String[] tmp = new String[firstArray.length + causeArray.length]; - System.arraycopy(firstArray, 0, tmp, 0, firstArray.length); - System - .arraycopy(causeArray, 0, tmp, firstArray.length, causeArray.length); - result = tmp; - } else { - result = firstArray; - } - return result; - } - - private int findCommonFrames(StackTraceElement[] ste, - StackTraceElement[] parentSTE) { - if (parentSTE == null) { - return 0; - } - - int steIndex = ste.length - 1; - int parentIndex = parentSTE.length - 1; - int count = 0; - while (steIndex >= 0 && parentIndex >= 0) { - if (ste[steIndex].equals(parentSTE[parentIndex])) { - count++; - } else { - break; - } - steIndex--; - parentIndex--; - } - return count; - } - /** * The string representation of the exceptopn (throwable) that this object * represents.

1 0

[Bug 92] New: TimeBasedRollingPolicy will not rollover a log file, append logs to a old log file.
by bugzilla-daemon＠pixie.qos.ch 13 May '08

13 May '08

http://bugzilla.qos.ch/show_bug.cgi?id=92 Summary: TimeBasedRollingPolicy will not rollover a log file, append logs to a old log file. Product: logback-core Version: unspecified Platform: All OS/Version: All Status: NEW Severity: critical Priority: P1 Component: Rolling AssignedTo: logback-dev(a)qos.ch ReportedBy: benbrand(a)mac.com If you use TimeBasedRollingPolicy to rollover a log file and no log wasn't wrote into the log beyond the timing of rollover, and if you restart your application, the log file doesn't roll, then new log will be appended into old log file. EVIDENCE: 1. in logback.xml, set your FileNamePattern like 'log.%d{yyyy-MM-dd_HH-mm}.log'. 2. Simply do a kind of thing, which will make some logs into your log file. 3. Wait for some minutes. 4. restart your application. 5. do a kind of thing, which will make some logs into your log file. the FileNamePattern is 'log.%d{yyyy-MM-dd_HH-mm}.log', so the log file will be roll every minutes. On case 5 of above example, the log file should be roll over, because some minutes already have passed after last logs wrote into the log file. But the file didn't be roll overed. THE CAUSE: In start() method of TimeBasedRollingPolicy, you initialize a variable 'lastCheck' to System.currentTimeStamp(). So if you restart your application, the last check time will be set to just NOW. you should initialize the variable to a last modified time of a current log file. See below source code. from '//modified by Tsutomu YANO' to '//until here'. SOURCE: public void start() { // set the LR for our utility object util.setContext(this.context); compress.setContext(this.context); // find out period from the filename pattern if (fileNamePatternStr != null) { fileNamePattern = new FileNamePattern(fileNamePatternStr, this.context); determineCompressionMode(); } else { addWarn(FNP_NOT_SET); addWarn(SEE_FNP_NOT_SET); throw new IllegalStateException(FNP_NOT_SET + SEE_FNP_NOT_SET); } DateTokenConverter dtc = fileNamePattern.getDateTokenConverter(); if (dtc == null) { throw new IllegalStateException("FileNamePattern [" + fileNamePattern.getPattern() + "] does not contain a valid DateToken"); } int len = fileNamePatternStr.length(); switch (compressionMode) { case Compress.GZ: activeFileNamePattern = new FileNamePattern(fileNamePatternStr.substring(0, len - 3), this.context); break; case Compress.ZIP: activeFileNamePattern = new FileNamePattern(fileNamePatternStr.substring(0, len - 4), this.context); break; case Compress.NONE: activeFileNamePattern = fileNamePattern; } addInfo("Will use the pattern " + activeFileNamePattern + " for the active file"); rc = new RollingCalendar(); rc.init(dtc.getDatePattern()); addInfo("The date pattern is '" + dtc.getDatePattern() + "' from file name pattern '" + fileNamePattern.getPattern() + "'."); rc.printPeriodicity(this); //modified by Tsutomu YANO //if a current log file exists, initialize a 'lastCheck' variable to the //last modified date of the file. File currentFile = new File(getParentFileName()); if(currentFile.exists() && currentFile.canRead()) { lastCheck.setTime(currentFile.lastModified()); } else { // currentTime = System.currentTimeMillis(); lastCheck.setTime(getCurrentTime()); } //until here nextCheck = rc.getNextCheckMillis(lastCheck); // Date nc = new Date(); // nc.setTime(nextCheck); } -- 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 2

svn commit: r1694 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch
by noreply.ceki＠qos.ch 09 May '08

09 May '08

Author: ceki Date: Fri May 9 17:11:41 2008 New Revision: 1694 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/ProfilerRegistry.java Log: - let the registry be thread specific Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/ProfilerRegistry.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/ProfilerRegistry.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/stopwatch/ProfilerRegistry.java Fri May 9 17:11:41 2008 @@ -20,6 +20,8 @@ */ public class ProfilerRegistry { + private static final InheritableThreadLocal<ProfilerRegistry> inheritableThreadLocal = new InheritableThreadLocal<ProfilerRegistry>(); + Map<String, Profiler> profilerMap = new HashMap<String, Profiler>(); @@ -27,6 +29,16 @@ profilerMap.put(name, profiler); } + + public static ProfilerRegistry getThreadContextInstance() { + ProfilerRegistry pr = inheritableThreadLocal.get(); + if(pr == null) { + pr = new ProfilerRegistry(); + inheritableThreadLocal.set(pr); + } + return pr; + } + public Profiler get(String name) { return profilerMap.get(name); }

1 0

svn commit: r1693 - logback/trunk/logback-classic
by noreply.ceki＠qos.ch 07 May '08

07 May '08

Author: ceki Date: Wed May 7 18:10:41 2008 New Revision: 1693 Modified: logback/trunk/logback-classic/pom.xml Log: - TestContants should not be run as a unit test Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Wed May 7 18:10:41 2008 @@ -138,6 +138,7 @@ <excludes> <exclude>**/AllTest.java</exclude> <exclude>**/PackageTest.java</exclude> + <exclude>**/TestConstants.java</exclude> <exclude>**/SerializationPerfsTest.java</exclude> <exclude>**/LoggerPerfTest.java</exclude> </excludes>

1 0

svn commit: r1692 - in logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic: . net
by noreply.ceki＠qos.ch 07 May '08

07 May '08

Author: ceki Date: Wed May 7 18:09:33 2008 New Revision: 1692 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestConstants.java - copied, changed from r1691, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestContants.java Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestContants.java 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/net/SyslogAppenderTest.java Log: - rename TestContants as TestConstants 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 Wed May 7 18:09:33 2008 @@ -64,7 +64,7 @@ pl.start(); String val = pl.doLayout(getEventObject()); // 2006-02-01 22:38:06,212 INFO [main] c.q.l.pattern.ConverterTest - Some message - String regex = TestContants.ISO_REGEX+" INFO \\[main] c.q.l.c.pattern.ConverterTest - Some message\\s*"; + String regex = TestConstants.ISO_REGEX+" INFO \\[main] c.q.l.c.pattern.ConverterTest - Some message\\s*"; assertTrue(val.matches(regex)); } @@ -86,7 +86,7 @@ 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 = TestContants.ISO_REGEX+" \\[main] c.q.l.c.p.ConverterTest - Some message\\s*"; + String regex = TestConstants.ISO_REGEX+" \\[main] c.q.l.c.p.ConverterTest - Some message\\s*"; System.out.println(val); assertTrue(val.matches(regex)); @@ -123,7 +123,7 @@ pl.start(); String val = pl.doLayout(getEventObject()); // 2006-02-01 22:38:06,212 INFO [main] c.q.l.pattern.ConverterTest - Some message - String regex = TestContants.ISO_REGEX+" INFO \\[main] c.q.l.c.pattern.ConverterTest - Some message\\s*"; + String regex = TestConstants.ISO_REGEX+" INFO \\[main] c.q.l.c.pattern.ConverterTest - Some message\\s*"; assertTrue(val.matches(regex)); } Copied: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestConstants.java (from r1691, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestContants.java) ============================================================================== --- /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestContants.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/TestConstants.java Wed May 7 18:09:33 2008 @@ -9,7 +9,7 @@ */ package ch.qos.logback.classic; -public class TestContants { +public class TestConstants { final static public String ISO_REGEX = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{3}"; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java Wed May 7 18:09:33 2008 @@ -19,7 +19,7 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.TestContants; +import ch.qos.logback.classic.TestConstants; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.net.mock.MockSyslogServer; import ch.qos.logback.core.joran.spi.JoranException; @@ -141,7 +141,7 @@ JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.shutdownAndReset(); - configurator.doConfigure(TestContants.JORAN_ONPUT_PREFIX + configurator.doConfigure(TestConstants.JORAN_ONPUT_PREFIX + "/syslog_147.xml"); org.slf4j.Logger logger = LoggerFactory.getLogger(this.getClass());

1 0