- logback-dev - mailman3.qos.ch

svn commit: r2352 - logback/trunk/logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 15 Jul '09

15 Jul '09

Author: ceki Date: Wed Jul 15 13:38:54 2009 New Revision: 2352 Modified: logback/trunk/logback-site/src/site/pages/manual/configuration.html Log: - documenting automatic reconfiguration Modified: logback/trunk/logback-site/src/site/pages/manual/configuration.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/configuration.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/configuration.html Wed Jul 15 13:38:54 2009 @@ -353,6 +353,31 @@ <p class="source">java <b>-Dlogback.configurationFile=/path/to/config.xml</b> chapter3.MyApp1</p> + + <h3><a name="autoScan" href="#autoScan">Automatically reloading + configuration file upon modification</a></h3> + + <p>If instructed to do so, logback-classic will scan for changes in + its configuration file and automatically reconfigure itself when + the said configuration file changes. + </p> + + <p>Logback-classic can be instructed to scan for changes in its + configuration file and to automatically re-configure itself by + setting the <span class="attr">scan</span> atrribute of the + <code><configuration></code> element to true, as shown next. + + </p> + <em>Example 3.<span class="autoEx"/>: Scanning for changes in + configuration file and automatic re-configuraion + (logback-examples/src/main/java/chapter3/scan1.xml)</em> + +<pre class="prettyprint source"> +<configuration <b>scan="true"</b>> + ... +</configuration> +</pre> + <h3>Invoking <code>JoranConfigurator</code> directly</h3> <p>Logback relies on a configuration library called Joran which is

1 0

svn commit: r2351 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/turbo test/java/ch/qos/logback/classic/turbo
by noreply.ceki＠qos.ch 15 Jul '09

15 Jul '09

Author: ceki Date: Wed Jul 15 13:15:03 2009 New Revision: 2351 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java Log: - cosmetic changes - added performance testing concerning ReconfigureOnChangeFilter (ongoing work) Related to LBCORE-59 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java Wed Jul 15 13:15:03 2009 @@ -49,7 +49,7 @@ synchronized (context) { long inSeconds = refreshPeriod / 1000; addInfo("Will scan for changes in file [" + fileToScan + "] every " - + inSeconds + " seconds. "+stem()); + + inSeconds + " seconds. "); lastModified = fileToScan.lastModified(); updateNextCheck(System.currentTimeMillis()); } @@ -71,12 +71,12 @@ } } - // a counter of the number of time the decide method is called + // The next fields counts the number of time the decide method is called + // // IMPORTANT: This field can be updated by multiple threads. It follows that - // its values may not be incremented sequentially. However, we don't care + // its values may *not* be incremented sequentially. However, we don't care // about the actual value of the field except that from time to time the // expression (invocationCounter++ & 0xF) == 0xF) should be true. - private int invocationCounter = 0; @Override @@ -94,8 +94,7 @@ synchronized (context) { boolean changed = changeDetected(); if (changed) { - addInfo("[" + fileToScan + "] change detected. Reconfiguring. "+stem()); - + addInfo("[" + fileToScan + "] change detected. Reconfiguring. "); addInfo("Resetting and reconfiguring context [" + context.getName() + "]"); reconfigure(); @@ -108,10 +107,10 @@ nextCheck = now + refreshPeriod; } - String stem() { - return currentThreadName() + ", context " + context.getName() - + ", nextCheck=" + (nextCheck - INIT); - } +// String stem() { +// return currentThreadName() + ", context " + context.getName() +// + ", nextCheck=" + (nextCheck - INIT); +// } // This method is synchronized to prevent near-simultaneous re-configurations protected boolean changeDetected() { Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/PackageTest.java Wed Jul 15 13:15:03 2009 @@ -1,20 +1,21 @@ /** * Logback: the generic, reliable, fast and flexible logging framework. * - * Copyright (C) 1999-2006, QOS.ch + * Copyright (C) 2000-2009, 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.classic.turbo; +package ch.qos.logback.classic.turbo; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( { MarkerFilterTest.class, DuplicateMessageFilterTest.class}) -public class PackageTest { +@SuiteClasses( { ReconfigureOnChangeTest.class, MarkerFilterTest.class, + DuplicateMessageFilterTest.class }) +public class PackageTest { } \ No newline at end of file Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java Wed Jul 15 13:15:03 2009 @@ -4,25 +4,30 @@ import java.io.File; import java.io.IOException; +import java.net.MalformedURLException; import org.junit.Test; +import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.issue.lbclassic135.LoggingRunnable; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.util.TeztConstants; +import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.contention.MultiThreadedHarness; import ch.qos.logback.core.contention.RunnableWithCounterAndDone; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.status.StatusChecker; -import ch.qos.logback.core.util.StatusPrinter; public class ReconfigureOnChangeTest { LoggerContext loggerContext = new LoggerContext(); Logger logger = loggerContext.getLogger(this.getClass()); final static int THREAD_COUNT = 5; + String SCAN1_FILE_AS_STR = TeztConstants.TEST_DIR_PREFIX + + "input/turbo/scan1.xml"; + static int TOTAL_TEST_DURATION = 2000; // it actually takes time for Windows to propagate file modification changes // values below 100 milliseconds can be problematic @@ -49,26 +54,55 @@ // Tests whether ConfigurationAction is installing ReconfigureOnChangeFilter @Test public void scan1() throws JoranException, IOException, InterruptedException { - - String configFileAsStr = TeztConstants.TEST_DIR_PREFIX - + "input/turbo/scan1.xml"; - configure(configFileAsStr); - - File file = new File(configFileAsStr); + configure(SCAN1_FILE_AS_STR); + File file = new File(SCAN1_FILE_AS_STR); RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(file); harness.execute(runnableArray); long expectedRreconfigurations = runnableArray[0].getCounter(); StatusChecker checker = new StatusChecker(loggerContext); - StatusPrinter.print(loggerContext); + //StatusPrinter.print(loggerContext); assertTrue(checker.isErrorFree()); - int result = checker.matchCount("Resetting and reconfiguring context"); - assertTrue(expectedRreconfigurations >= result); + int effectiveResets = checker.matchCount("Resetting and reconfiguring context"); + // the number of effective resets must be equal or less than expectedRreconfigurations + assertTrue(effectiveResets <= expectedRreconfigurations); + // however, there should be some effective resets + assertTrue((effectiveResets * 1.1) >= (expectedRreconfigurations * 1.0)); } - - + @Test + public void perfTest() throws MalformedURLException { + ReconfigureOnChangeFilter rocf = new ReconfigureOnChangeFilter(); + rocf.setContext(loggerContext); + File file = new File(SCAN1_FILE_AS_STR); + loggerContext.putObject(CoreConstants.URL_OF_LAST_CONFIGURATION_VIA_JORAN, + file.toURI().toURL()); + rocf.start(); + assertTrue(rocf.isStarted()); + loggerContext.addTurboFilter(rocf); + + final int loopLen = 1000*1000; + + loop(loopLen, rocf); + loop(loopLen, rocf); + double avg = loop(loopLen, rocf); + System.out.println(avg); + // the reference was computed on Orion (Ceki's computer) + //long referencePerf = 5000; + //BogoPerf.assertDuration(avg, referencePerf, CoreConstants.REFERENCE_BIPS); + } + + public double loop(int loopLen, ReconfigureOnChangeFilter rocf) { + long start = System.nanoTime(); + for (int i = 0; i < loopLen; i++) { + //logger.debug("hello"); + rocf.decide(null, logger, Level.DEBUG, " ", null, null); + } + long end = System.nanoTime(); + return (end - start) / (1.0d * loopLen); + } + class Updater extends RunnableWithCounterAndDone { File configFile;

1 0

svn commit: r2350 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 15 Jul '09

15 Jul '09

Author: ceki Date: Wed Jul 15 11:02:38 2009 New Revision: 2350 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java Log: - remove bogus getName method in LoggerContext Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java Wed Jul 15 11:02:38 2009 @@ -350,10 +350,4 @@ public void setMaxCallerDataDepth(int maxCallerDataDepth) { this.maxCallerDataDepth = maxCallerDataDepth; } - - @Override - public String getName() { - return "resetCount="+resetCount; - } - }

1 0

svn commit: r2349 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic main/java/ch/qos/logback/classic/turbo test/input/turbo test/java/ch/qos/logback/classic/turbo
by noreply.ceki＠qos.ch 15 Jul '09

15 Jul '09

Author: ceki Date: Wed Jul 15 10:54:51 2009 New Revision: 2349 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java logback/trunk/logback-classic/src/test/input/turbo/scan1.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java Log: - Tested version of ReconfigureOnChnage. Related to LBCORE-59 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java Wed Jul 15 10:54:51 2009 @@ -66,6 +66,8 @@ boolean started = false; + int resetCount = 0; + public LoggerContext() { super(); this.loggerCache = new Hashtable<String, Logger>(); @@ -207,6 +209,7 @@ */ @Override public void reset() { + resetCount++; super.reset(); root.recursiveReset(); resetTurboFilterList(); @@ -347,5 +350,10 @@ public void setMaxCallerDataDepth(int maxCallerDataDepth) { this.maxCallerDataDepth = maxCallerDataDepth; } + + @Override + public String getName() { + return "resetCount="+resetCount; + } } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java Wed Jul 15 10:54:51 2009 @@ -30,6 +30,9 @@ */ public class ReconfigureOnChangeFilter extends TurboFilter { + final static long INIT = System.currentTimeMillis(); + final static long SENTINEL = Long.MAX_VALUE; + final static long DEFAULT_REFRESH_PERIOD = 60 * 1000; // 1 minute long refreshPeriod = DEFAULT_REFRESH_PERIOD; File fileToScan; @@ -43,15 +46,17 @@ if (url != null) { fileToScan = convertToFile(url); if (fileToScan != null) { - long inSeconds = refreshPeriod / 1000; - addInfo("Will scan for changes in file [" + fileToScan + "] every " - + inSeconds + " seconds"+ " Thread "+currentThreadName()); - lastModified = fileToScan.lastModified(); - updateNextCheck(System.currentTimeMillis()); + synchronized (context) { + long inSeconds = refreshPeriod / 1000; + addInfo("Will scan for changes in file [" + fileToScan + "] every " + + inSeconds + " seconds. "+stem()); + lastModified = fileToScan.lastModified(); + updateNextCheck(System.currentTimeMillis()); + } super.start(); } } else { - addError("Could not find URL of file to scan. Thread "+currentThreadName()); + addError("Could not find URL of file to scan."); } } @@ -86,11 +91,15 @@ return FilterReply.NEUTRAL; } - boolean changed = changeDetected(); - if (changed) { - addInfo("[" + fileToScan + "] change detected. Reconfiguring "+currentThreadName()); - addInfo("Resetting and reconfiguring context [" + context.getName() + "]"); - reconfigure(); + synchronized (context) { + boolean changed = changeDetected(); + if (changed) { + addInfo("[" + fileToScan + "] change detected. Reconfiguring. "+stem()); + + addInfo("Resetting and reconfiguring context [" + context.getName() + + "]"); + reconfigure(); + } } return FilterReply.NEUTRAL; } @@ -99,12 +108,17 @@ nextCheck = now + refreshPeriod; } + String stem() { + return currentThreadName() + ", context " + context.getName() + + ", nextCheck=" + (nextCheck - INIT); + } + // This method is synchronized to prevent near-simultaneous re-configurations - protected synchronized boolean changeDetected() { + protected boolean changeDetected() { long now = System.currentTimeMillis(); if (now >= nextCheck) { updateNextCheck(now); - return (lastModified != fileToScan.lastModified()); + return (lastModified != fileToScan.lastModified() && lastModified != SENTINEL); } return false; } @@ -112,7 +126,19 @@ String currentThreadName() { return Thread.currentThread().getName(); } + + void disableSubsequentRecofiguration() { + lastModified = SENTINEL; + } + protected void reconfigure() { + // Even though this method resets the loggerContext, which clears the list + // of turbo filters including this instance, it is still possible for this + // instance to be subsequently invoked by another thread if it was already + // executing when the context was reset. + // We prevent multiple reconfigurations (for the same file change event) by + // setting an appropriate sentinel value for lastMofidied field. + disableSubsequentRecofiguration(); JoranConfigurator jc = new JoranConfigurator(); jc.setContext(context); LoggerContext lc = (LoggerContext) context; Modified: logback/trunk/logback-classic/src/test/input/turbo/scan1.xml ============================================================================== --- logback/trunk/logback-classic/src/test/input/turbo/scan1.xml (original) +++ logback/trunk/logback-classic/src/test/input/turbo/scan1.xml Wed Jul 15 10:54:51 2009 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE configuration> -<configuration scan="true" scanPeriod="1 millisecond"> +<configuration scan="true" scanPeriod="10 millisecond"> <root level="ERROR"/> </configuration> \ No newline at end of file Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java Wed Jul 15 10:54:51 2009 @@ -1,6 +1,5 @@ package ch.qos.logback.classic.turbo; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.File; @@ -13,7 +12,6 @@ import ch.qos.logback.classic.issue.lbclassic135.LoggingRunnable; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.util.TeztConstants; - import ch.qos.logback.core.contention.MultiThreadedHarness; import ch.qos.logback.core.contention.RunnableWithCounterAndDone; import ch.qos.logback.core.joran.spi.JoranException; @@ -23,13 +21,15 @@ public class ReconfigureOnChangeTest { LoggerContext loggerContext = new LoggerContext(); Logger logger = loggerContext.getLogger(this.getClass()); - final static int THREAD_COUNT = 3; + final static int THREAD_COUNT = 5; + + static int TOTAL_TEST_DURATION = 2000; + // it actually takes time for Windows to propagate file modification changes + // values below 100 milliseconds can be problematic + static int SLEEP_BETWEEN_UPDATES = 300; - static int TOTAL_TEST_DURATION = 10000; - static int SLEEP_BETWEEN_UPDATES = 1000; - MultiThreadedHarness harness = new MultiThreadedHarness(TOTAL_TEST_DURATION); - + void configure(String file) throws JoranException { JoranConfigurator jc = new JoranConfigurator(); jc.setContext(loggerContext); @@ -57,36 +57,38 @@ File file = new File(configFileAsStr); RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(file); harness.execute(runnableArray); - + long expectedRreconfigurations = runnableArray[0].getCounter(); - + StatusChecker checker = new StatusChecker(loggerContext); StatusPrinter.print(loggerContext); assertTrue(checker.isErrorFree()); int result = checker.matchCount("Resetting and reconfiguring context"); - assertEquals(expectedRreconfigurations, result); - + assertTrue(expectedRreconfigurations >= result); } + + class Updater extends RunnableWithCounterAndDone { File configFile; + Updater(File configFile) { this.configFile = configFile; } + public void run() { while (!isDone()) { try { Thread.sleep(SLEEP_BETWEEN_UPDATES); } catch (InterruptedException e) { } - if(isDone()) { + if (isDone()) { return; } counter++; configFile.setLastModified(System.currentTimeMillis()); } } - } }

1 0

svn commit: r2348 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic/turbo logback-classic/src/test/input/turbo logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135 logback-classic/src/test/java/ch/qos/logback/classic/joran logback-classic/src/test/java/ch/qos/logback/classic/turbo logback-core/src/test/java/ch/qos/logback/core/contention logback-core/src/test/java/ch/qos/logback/core/status
by noreply.ceki＠qos.ch 14 Jul '09

14 Jul '09

Author: ceki Date: Tue Jul 14 22:47:17 2009 New Revision: 2348 Added: logback/trunk/logback-classic/src/test/input/turbo/ logback/trunk/logback-classic/src/test/input/turbo/scan1.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/LoggingRunnable.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/MultiThreadedHarness.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java Log: - testing auto reconfiguration in a multi-threaded environment. Related to LBCORE-59 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java Tue Jul 14 22:47:17 2009 @@ -25,66 +25,71 @@ /** * Reconfigure a LoggerContext when the configuration file changes. * - * @author Ceki Gulcu - * - * */ + * @author Ceki Gulcu + * + */ public class ReconfigureOnChangeFilter extends TurboFilter { - final static long DEFAULT_REFRESH_PERIOD = 60*1000; // 1 minute + final static long DEFAULT_REFRESH_PERIOD = 60 * 1000; // 1 minute long refreshPeriod = DEFAULT_REFRESH_PERIOD; File fileToScan; protected long nextCheck; long lastModified; - @Override public void start() { - URL url = (URL) context.getObject(CoreConstants.URL_OF_LAST_CONFIGURATION_VIA_JORAN); - if(url != null) { + URL url = (URL) context + .getObject(CoreConstants.URL_OF_LAST_CONFIGURATION_VIA_JORAN); + if (url != null) { fileToScan = convertToFile(url); - if(fileToScan != null) { - long inSeconds = refreshPeriod/1000; - addInfo("Will scan for changes in file ["+fileToScan+"] every "+inSeconds+" seconds"); + if (fileToScan != null) { + long inSeconds = refreshPeriod / 1000; + addInfo("Will scan for changes in file [" + fileToScan + "] every " + + inSeconds + " seconds"+ " Thread "+currentThreadName()); lastModified = fileToScan.lastModified(); updateNextCheck(System.currentTimeMillis()); super.start(); } } else { - addError("Could not find URL of file to scan."); + addError("Could not find URL of file to scan. Thread "+currentThreadName()); } } - + File convertToFile(URL url) { String protocol = url.getProtocol(); - if("file".equals(protocol)) { + if ("file".equals(protocol)) { File file = new File(url.getFile()); return file; } else { - addError("URL ["+url+"] is not of type file"); + addError("URL [" + url + "] is not of type file"); return null; } } - + // a counter of the number of time the decide method is called - private volatile int invocationCounter = 0; - + // IMPORTANT: This field can be updated by multiple threads. It follows that + // its values may not be incremented sequentially. However, we don't care + // about the actual value of the field except that from time to time the + // expression (invocationCounter++ & 0xF) == 0xF) should be true. + + private int invocationCounter = 0; + @Override - public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { - if(!isStarted()) { + public FilterReply decide(Marker marker, Logger logger, Level level, + String format, Object[] params, Throwable t) { + if (!isStarted()) { return FilterReply.NEUTRAL; } - - System.out.println("counter="+invocationCounter+", format="+format); + // for performance reasons, check for changes every 16 invocations - if(((invocationCounter++) & 0xF) != 0xF) { + if (((invocationCounter++) & 0xF) != 0xF) { return FilterReply.NEUTRAL; } - boolean changed = changeDetected(); - if(changed) { - addInfo("["+fileToScan + "] change detected. Reconfiguring"); - addInfo("Resetting and reconfiguring context ["+context.getName()+"]"); + if (changed) { + addInfo("[" + fileToScan + "] change detected. Reconfiguring "+currentThreadName()); + addInfo("Resetting and reconfiguring context [" + context.getName() + "]"); reconfigure(); } return FilterReply.NEUTRAL; @@ -93,17 +98,20 @@ void updateNextCheck(long now) { nextCheck = now + refreshPeriod; } - - protected boolean changeDetected() { + + // This method is synchronized to prevent near-simultaneous re-configurations + protected synchronized boolean changeDetected() { long now = System.currentTimeMillis(); - if(now >= nextCheck) { + if (now >= nextCheck) { updateNextCheck(now); return (lastModified != fileToScan.lastModified()); } return false; } - - + + String currentThreadName() { + return Thread.currentThread().getName(); + } protected void reconfigure() { JoranConfigurator jc = new JoranConfigurator(); jc.setContext(context); @@ -113,7 +121,7 @@ jc.doConfigure(fileToScan); } catch (JoranException e) { addError("Failure during reconfiguration", e); - } + } } public long getRefreshPeriod() { Added: logback/trunk/logback-classic/src/test/input/turbo/scan1.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/turbo/scan1.xml Tue Jul 14 22:47:17 2009 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration scan="true" scanPeriod="1 millisecond"> + <root level="ERROR"/> +</configuration> + \ No newline at end of file Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/LoggingRunnable.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/LoggingRunnable.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbclassic135/LoggingRunnable.java Tue Jul 14 22:47:17 2009 @@ -16,7 +16,7 @@ Logger logger; - LoggingRunnable(Logger logger) { + public LoggingRunnable(Logger logger) { this.logger = logger; } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Tue Jul 14 22:47:17 2009 @@ -248,6 +248,7 @@ assertEquals("hello user2", le.getMessage()); } + // Tests whether ConfigurationAction is installing ReconfigureOnChangeFilter @Test public void scan1() throws JoranException, IOException, InterruptedException { @@ -267,6 +268,5 @@ assertTrue(checker.isErrorFree()); assertTrue(checker.containsMatch("Resetting and reconfiguring context")); StatusPrinter.print(loggerContext); - } } Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java Tue Jul 14 22:47:17 2009 @@ -0,0 +1,92 @@ +package ch.qos.logback.classic.turbo; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; + +import org.junit.Test; + +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.issue.lbclassic135.LoggingRunnable; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.classic.util.TeztConstants; + +import ch.qos.logback.core.contention.MultiThreadedHarness; +import ch.qos.logback.core.contention.RunnableWithCounterAndDone; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.status.StatusChecker; +import ch.qos.logback.core.util.StatusPrinter; + +public class ReconfigureOnChangeTest { + LoggerContext loggerContext = new LoggerContext(); + Logger logger = loggerContext.getLogger(this.getClass()); + final static int THREAD_COUNT = 3; + + static int TOTAL_TEST_DURATION = 10000; + static int SLEEP_BETWEEN_UPDATES = 1000; + + MultiThreadedHarness harness = new MultiThreadedHarness(TOTAL_TEST_DURATION); + + void configure(String file) throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(loggerContext); + jc.doConfigure(file); + } + + RunnableWithCounterAndDone[] buildRunnableArray(File configFile) { + + RunnableWithCounterAndDone[] rArray = new RunnableWithCounterAndDone[THREAD_COUNT]; + rArray[0] = new Updater(configFile); + for (int i = 1; i < THREAD_COUNT; i++) { + rArray[i] = new LoggingRunnable(logger); + } + return rArray; + } + + // Tests whether ConfigurationAction is installing ReconfigureOnChangeFilter + @Test + public void scan1() throws JoranException, IOException, InterruptedException { + + String configFileAsStr = TeztConstants.TEST_DIR_PREFIX + + "input/turbo/scan1.xml"; + configure(configFileAsStr); + + File file = new File(configFileAsStr); + RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(file); + harness.execute(runnableArray); + + long expectedRreconfigurations = runnableArray[0].getCounter(); + + StatusChecker checker = new StatusChecker(loggerContext); + StatusPrinter.print(loggerContext); + assertTrue(checker.isErrorFree()); + int result = checker.matchCount("Resetting and reconfiguring context"); + assertEquals(expectedRreconfigurations, result); + + } + + class Updater extends RunnableWithCounterAndDone { + File configFile; + Updater(File configFile) { + this.configFile = configFile; + } + public void run() { + while (!isDone()) { + try { + Thread.sleep(SLEEP_BETWEEN_UPDATES); + } catch (InterruptedException e) { + } + if(isDone()) { + return; + } + counter++; + configFile.setLastModified(System.currentTimeMillis()); + } + } + + } + +} Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/MultiThreadedHarness.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/MultiThreadedHarness.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/MultiThreadedHarness.java Tue Jul 14 22:47:17 2009 @@ -47,7 +47,7 @@ Thread[] threadArray = new Thread[runnableArray.length]; for (int i = 0; i < runnableArray.length; i++) { - threadArray[i] = new Thread(runnableArray[i]); + threadArray[i] = new Thread(runnableArray[i], "Harness["+i+"]"); } for (Thread t : threadArray) { t.start(); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java Tue Jul 14 22:47:17 2009 @@ -61,6 +61,19 @@ return false; } + public int matchCount(String regex) { + int count = 0; + Pattern p = Pattern.compile(regex); + for(Status status: sm.getCopyOfStatusList()) { + String msg = status.getMessage(); + Matcher matcher = p.matcher(msg); + if (matcher.lookingAt()) { + count++; + } + } + return count; + } + public boolean containsException(Class exceptionType) { Iterator stati = sm.getCopyOfStatusList().iterator(); while (stati.hasNext()) {

1 0

svn commit: r2347 - in logback/trunk/logback-site/src/site/pages: css js manual templates
by noreply.ceki＠qos.ch 14 Jul '09

14 Jul '09

Author: ceki Date: Tue Jul 14 19:23:48 2009 New Revision: 2347 Added: logback/trunk/logback-site/src/site/pages/css/prettify.css logback/trunk/logback-site/src/site/pages/js/ logback/trunk/logback-site/src/site/pages/js/prettify.js Modified: logback/trunk/logback-site/src/site/pages/manual/configuration.html logback/trunk/logback-site/src/site/pages/templates/creative.js Log: - prettifying manual pages. Started with configuration.html Added: logback/trunk/logback-site/src/site/pages/css/prettify.css ============================================================================== --- (empty file) +++ logback/trunk/logback-site/src/site/pages/css/prettify.css Tue Jul 14 19:23:48 2009 @@ -0,0 +1,28 @@ +.str{color:#080} +.kwd{color:#008} +.com{color:#800} +.typ{color:#606} +.lit{color:#066} +.pun{color:#660} +.pln{color:#000} +.tag{color:#008} +.atn{color:#606} +.atv{color:#080} +.dec{color:#606} + +pre.prettyprint{ + padding:2px; +} +@media print{.str{color:#060} + +.kwd{ + color:#006;font-weight:bold} + .com{color:#600;font-style:italic +} +.typ{color:#404;font-weight:bold} +.lit{color:#044} +.pun{color:#440} +.pln{color:#000} +.tag{color:#006;font-weight:bold} +.atn{color:#404} +.atv{color:#060}} \ No newline at end of file Added: logback/trunk/logback-site/src/site/pages/js/prettify.js ============================================================================== --- (empty file) +++ logback/trunk/logback-site/src/site/pages/js/prettify.js Tue Jul 14 19:23:48 2009 @@ -0,0 +1,23 @@ +function H(){var x=navigator&&navigator.userAgent&&/\bMSIE 6\./.test(navigator.userAgent);H=function(){return x};return x}(function(){function x(b){b=b.split(/ /g);var a={};for(var c=b.length;--c>=0;){var d=b[c];if(d)a[d]=null}return a}var y="break continue do else for if return while ",U=y+"auto case char const default double enum extern float goto int long register short signed sizeof static struct switch typedef union unsigned void volatile ",D=U+"catch class delete false import new operator private protected public this throw true try ", +I=D+"alignof align_union asm axiom bool concept concept_map const_cast constexpr decltype dynamic_cast explicit export friend inline late_check mutable namespace nullptr reinterpret_cast static_assert static_cast template typeid typename typeof using virtual wchar_t where ",J=D+"boolean byte extends final finally implements import instanceof null native package strictfp super synchronized throws transient ",V=J+"as base by checked decimal delegate descending event fixed foreach from group implicit in interface internal into is lock object out override orderby params readonly ref sbyte sealed stackalloc string select uint ulong unchecked unsafe ushort var ", +K=D+"debugger eval export function get null set undefined var with Infinity NaN ",L="caller delete die do dump elsif eval exit foreach for goto if import last local my next no our print package redo require sub undef unless until use wantarray while BEGIN END ",M=y+"and as assert class def del elif except exec finally from global import in is lambda nonlocal not or pass print raise try with yield False True None ",N=y+"alias and begin case class def defined elsif end ensure false in module next nil not or redo rescue retry self super then true undef unless until when yield BEGIN END ", +O=y+"case done elif esac eval fi function in local set then until ",W=I+V+K+L+M+N+O;function X(b){return b>="a"&&b<="z"||b>="A"&&b<="Z"}function u(b,a,c,d){b.unshift(c,d||0);try{a.splice.apply(a,b)}finally{b.splice(0,2)}}var Y=(function(){var b=["!","!=","!==","#","%","%=","&","&&","&&=","&=","(","*","*=","+=",",","-=","->","/","/=",":","::",";","<","<<","<<=","<=","=","==","===",">",">=",">>",">>=",">>>",">>>=","?","@","[","^","^=","^^","^^=","{","|","|=","||","||=","~","break","case","continue", +"delete","do","else","finally","instanceof","return","throw","try","typeof"],a="(?:(?:(?:^|[^0-9.])\\.{1,3})|(?:(?:^|[^\\+])\\+)|(?:(?:^|[^\\-])-)";for(var c=0;c<b.length;++c){var d=b[c];a+=X(d.charAt(0))?"|\\b"+d:"|"+d.replace(/([^=<>:&])/g,"\\$1")}a+="|^)\\s*$";return new RegExp(a)})(),P=/&/g,Q=/</g,R=/>/g,Z=/\"/g;function $(b){return b.replace(P,"&").replace(Q,"<").replace(R,">").replace(Z,""")}function E(b){return b.replace(P,"&").replace(Q,"<").replace(R,">")}var aa= +/</g,ba=/>/g,ca=/'/g,da=/"/g,ea=/&/g,fa=/ /g;function ga(b){var a=b.indexOf("&");if(a<0)return b;for(--a;(a=b.indexOf("&#",a+1))>=0;){var c=b.indexOf(";",a);if(c>=0){var d=b.substring(a+3,c),g=10;if(d&&d.charAt(0)==="x"){d=d.substring(1);g=16}var e=parseInt(d,g);if(!isNaN(e))b=b.substring(0,a)+String.fromCharCode(e)+b.substring(c+1)}}return b.replace(aa,"<").replace(ba,">").replace(ca,"'").replace(da,'"').replace(ea,"&").replace(fa," ")}function S(b){return"XMP"===b.tagName} +function z(b,a){switch(b.nodeType){case 1:var c=b.tagName.toLowerCase();a.push("<",c);for(var d=0;d<b.attributes.length;++d){var g=b.attributes[d];if(!g.specified)continue;a.push(" ");z(g,a)}a.push(">");for(var e=b.firstChild;e;e=e.nextSibling)z(e,a);if(b.firstChild||!/^(?:br|link|img)$/.test(c))a.push("</",c,">");break;case 2:a.push(b.name.toLowerCase(),'="',$(b.value),'"');break;case 3:case 4:a.push(E(b.nodeValue));break}}var F=null;function ha(b){if(null===F){var a=document.createElement("PRE"); +a.appendChild(document.createTextNode('<!DOCTYPE foo PUBLIC "foo bar">\n<foo />'));F=!/</.test(a.innerHTML)}if(F){var c=b.innerHTML;if(S(b))c=E(c);return c}var d=[];for(var g=b.firstChild;g;g=g.nextSibling)z(g,d);return d.join("")}function ia(b){var a=0;return function(c){var d=null,g=0;for(var e=0,h=c.length;e<h;++e){var f=c.charAt(e);switch(f){case "\t":if(!d)d=[];d.push(c.substring(g,e));var i=b-a%b;a+=i;for(;i>=0;i-=" ".length)d.push(" ".substring(0,i));g=e+1;break; +case "\n":a=0;break;default:++a}}if(!d)return c;d.push(c.substring(g));return d.join("")}}var ja=/(?:[^<]+|<!--[\s\S]*?--\>|<!\[CDATA\[([\s\S]*?)\]\]>|<\/?[a-zA-Z][^>]*>|<)/g,ka=/^<!--/,la=/^<\[CDATA\[/,ma=/^<br\b/i;function na(b){var a=b.match(ja),c=[],d=0,g=[];if(a)for(var e=0,h=a.length;e<h;++e){var f=a[e];if(f.length>1&&f.charAt(0)==="<"){if(ka.test(f))continue;if(la.test(f)){c.push(f.substring(9,f.length-3));d+=f.length-12}else if(ma.test(f)){c.push("\n");++d}else g.push(d,f)}else{var i=ga(f); +c.push(i);d+=i.length}}return{source:c.join(""),tags:g}}function v(b,a){var c={};(function(){var g=b.concat(a);for(var e=g.length;--e>=0;){var h=g[e],f=h[3];if(f)for(var i=f.length;--i>=0;)c[f.charAt(i)]=h}})();var d=a.length;return function(g,e){e=e||0;var h=[e,"pln"],f="",i=0,j=g;while(j.length){var o,m=null,k,l=c[j.charAt(0)];if(l){k=j.match(l[1]);m=k[0];o=l[0]}else{for(var n=0;n<d;++n){l=a[n];var p=l[2];if(p&&!p.test(f))continue;k=j.match(l[1]);if(k){m=k[0];o=l[0];break}}if(!m){o="pln";m=j.substring(0, +1)}}h.push(e+i,o);i+=m.length;j=j.substring(m.length);if(o!=="com"&&/\S/.test(m))f=m}return h}}var oa=v([],[["pln",/^[^<]+/,null],["dec",/^<!\w[^>]*(?:>|$)/,null],["com",/^<!--[\s\S]*?(?:--\>|$)/,null],["src",/^<\?[\s\S]*?(?:\?>|$)/,null],["src",/^<%[\s\S]*?(?:%>|$)/,null],["src",/^<(script|style|xmp)\b[^>]*>[\s\S]*?<\/\1\b[^>]*>/i,null],["tag",/^<\/?\w[^<>]*>/,null]]);function pa(b){var a=oa(b);for(var c=0;c<a.length;c+=2)if(a[c+1]==="src"){var d,g;d=a[c];g=c+2<a.length?a[c+2]:b.length;var e=b.substring(d, +g),h=e.match(/^(<[^>]*>)([\s\S]*)(<\/[^>]*>)$/);if(h)a.splice(c,2,d,"tag",d+h[1].length,"src",d+h[1].length+(h[2]||"").length,"tag")}return a}var qa=v([["atv",/^\'[^\']*(?:\'|$)/,null,"'"],["atv",/^\"[^\"]*(?:\"|$)/,null,'"'],["pun",/^[<>\/=]+/,null,"<>/="]],[["tag",/^[\w:\-]+/,/^</],["atv",/^[\w\-]+/,/^=/],["atn",/^[\w:\-]+/,null],["pln",/^\s+/,null," \t\r\n"]]);function ra(b,a){for(var c=0;c<a.length;c+=2){var d=a[c+1];if(d==="tag"){var g,e;g=a[c];e=c+2<a.length?a[c+2]:b.length;var h=b.substring(g, +e),f=qa(h,g);u(f,a,c,2);c+=f.length-2}}return a}function r(b){var a=[],c=[];if(b.tripleQuotedStrings)a.push(["str",/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""]);else if(b.multiLineStrings)a.push(["str",/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"]);else a.push(["str",/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/, +null,"\"'"]);c.push(["pln",/^(?:[^\'\"\`\/\#]+)/,null," \r\n"]);if(b.hashComments)a.push(["com",/^#[^\r\n]*/,null,"#"]);if(b.cStyleComments)c.push(["com",/^\/\/[^\r\n]*/,null]);if(b.regexLiterals)c.push(["str",/^\/(?:[^\\\*\/\[]|\\[\s\S]|\[(?:[^\]\\]|\\.)*(?:\]|$))+(?:\/|$)/,Y]);if(b.cStyleComments)c.push(["com",/^\/\*[\s\S]*?(?:\*\/|$)/,null]);var d=x(b.keywords);b=null;var g=v(a,c),e=v([],[["pln",/^\s+/,null," \r\n"],["pln",/^[a-z_$@][a-z_$@0-9]*/i,null],["lit",/^0x[a-f0-9]+[a-z]/i,null],["lit", +/^(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d+)(?:e[+\-]?\d+)?[a-z]*/i,null,"123456789"],["pun",/^[^\s\w\.$@]+/,null]]);function h(f,i){for(var j=0;j<i.length;j+=2){var o=i[j+1];if(o==="pln"){var m,k,l,n;m=i[j];k=j+2<i.length?i[j+2]:f.length;l=f.substring(m,k);n=e(l,m);for(var p=0,t=n.length;p<t;p+=2){var w=n[p+1];if(w==="pln"){var A=n[p],B=p+2<t?n[p+2]:l.length,s=f.substring(A,B);if(s===".")n[p+1]="pun";else if(s in d)n[p+1]="kwd";else if(/^(a)?[A-Z][A-Z$]*[a-z][A-Za-z$]*$/.test(s))n[p+1]=s.charAt(0)==="@"?"lit": +"typ"}}u(n,i,j,2);j+=n.length-2}}return i}return function(f){var i=g(f);i=h(f,i);return i}}var G=r({keywords:W,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function sa(b,a){for(var c=0;c<a.length;c+=2){var d=a[c+1];if(d==="src"){var g,e;g=a[c];e=c+2<a.length?a[c+2]:b.length;var h=G(b.substring(g,e));for(var f=0,i=h.length;f<i;f+=2)h[f]+=g;u(h,a,c,2);c+=h.length-2}}return a}function ta(b,a){var c=false;for(var d=0;d<a.length;d+=2){var g=a[d+1],e,h;if(g==="atn"){e= +a[d];h=d+2<a.length?a[d+2]:b.length;c=/^on|^style$/i.test(b.substring(e,h))}else if(g==="atv"){if(c){e=a[d];h=d+2<a.length?a[d+2]:b.length;var f=b.substring(e,h),i=f.length,j=i>=2&&/^[\"\']/.test(f)&&f.charAt(0)===f.charAt(i-1),o,m,k;if(j){m=e+1;k=h-1;o=f}else{m=e+1;k=h-1;o=f.substring(1,f.length-1)}var l=G(o);for(var n=0,p=l.length;n<p;n+=2)l[n]+=m;if(j){l.push(k,"atv");u(l,a,d+2,0)}else u(l,a,d,2)}c=false}}return a}function ua(b){var a=pa(b);a=ra(b,a);a=sa(b,a);a=ta(b,a);return a}function va(b, +a,c){var d=[],g=0,e=null,h=null,f=0,i=0,j=ia(8);function o(k){if(k>g){if(e&&e!==h){d.push("</span>");e=null}if(!e&&h){e=h;d.push('<span class="',e,'">')}var l=E(j(b.substring(g,k))).replace(/(\r\n?|\n| ) /g,"$1 ").replace(/\r\n?|\n/g,"<br />");d.push(l);g=k}}while(true){var m;m=f<a.length?(i<c.length?a[f]<=c[i]:true):false;if(m){o(a[f]);if(e){d.push("</span>");e=null}d.push(a[f+1]);f+=2}else if(i<c.length){o(c[i]);h=c[i+1];i+=2}else break}o(b.length);if(e)d.push("</span>");return d.join("")} +var C={};function q(b,a){for(var c=a.length;--c>=0;){var d=a[c];if(!C.hasOwnProperty(d))C[d]=b;else if("console"in window)console.log("cannot override language handler %s",d)}}q(G,["default-code"]);q(ua,["default-markup","html","htm","xhtml","xml","xsl"]);q(r({keywords:I,hashComments:true,cStyleComments:true}),["c","cc","cpp","cs","cxx","cyc"]);q(r({keywords:J,cStyleComments:true}),["java"]);q(r({keywords:O,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);q(r({keywords:M,hashComments:true, +multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);q(r({keywords:L,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);q(r({keywords:N,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);q(r({keywords:K,cStyleComments:true,regexLiterals:true}),["js"]);function T(b,a){try{var c=na(b),d=c.source,g=c.tags;if(!C.hasOwnProperty(a))a=/^\s*</.test(d)?"default-markup":"default-code";var e=C[a].call({},d);return va(d,g,e)}catch(h){if("console"in window){console.log(h); +console.trace()}return b}}function wa(b){var a=H(),c=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],d=[];for(var g=0;g<c.length;++g)for(var e=0;e<c[g].length;++e)d.push(c[g][e]);c=null;var h=0;function f(){var i=(new Date).getTime()+250;for(;h<d.length&&(new Date).getTime()<i;h++){var j=d[h];if(j.className&&j.className.indexOf("prettyprint")>=0){var o=j.className.match(/\blang-(\w+)\b/);if(o)o=o[1];var m=false;for(var k=j.parentNode;k;k= +k.parentNode)if((k.tagName==="pre"||k.tagName==="code"||k.tagName==="xmp")&&k.className&&k.className.indexOf("prettyprint")>=0){m=true;break}if(!m){var l=ha(j);l=l.replace(/(?:\r\n?|\n)$/,"");var n=T(l,o);if(!S(j))j.innerHTML=n;else{var p=document.createElement("PRE");for(var t=0;t<j.attributes.length;++t){var w=j.attributes[t];if(w.specified)p.setAttribute(w.name,w.value)}p.innerHTML=n;j.parentNode.replaceChild(p,j);p=j}if(a&&j.tagName==="PRE"){var A=j.getElementsByTagName("br");for(var B=A.length;--B>= +0;){var s=A[B];s.parentNode.replaceChild(document.createTextNode("\r\n"),s)}}}}}if(h<d.length)setTimeout(f,250);else if(b)b()}f()}window.PR_normalizedHtml=z;window.prettyPrintOne=T;window.prettyPrint=wa;window.PR={createSimpleLexer:v,registerLangHandler:q,sourceDecorator:r,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})(); Modified: logback/trunk/logback-site/src/site/pages/manual/configuration.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/configuration.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/configuration.html Tue Jul 14 19:23:48 2009 @@ -9,9 +9,13 @@ <link rel="stylesheet" type="text/css" href="../css/common.css" /> <link rel="stylesheet" type="text/css" href="../css/screen.css" media="screen" /> <link rel="stylesheet" type="text/css" href="../css/_print.css" media="print" /> + <link rel="stylesheet" type="text/css" href="../css/prettify.css" media="screen" /> + </head> - <body> + <body onload="prettyPrint()"> + <script type="text/javascript">prefix='../'</script> + <script type="text/javascript" src="../js/prettify.js"></script> <script src="../templates/header.js" type="text/javascript"></script> <div id="left"> <noscript>Please turn on Javascript to view this menu</noscript> @@ -128,7 +132,7 @@ <code>BasicConfigurator</code> usage <a href="../xref/chapter3/MyApp1.html">(logback-examples/src/main/java/chapter3/MyApp1.java)</a></em> - <p class="source">package chapter3; + <pre class="prettyprint source">package chapter3; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -143,7 +147,7 @@ foo.doIt(); logger.info("Exiting application."); } -}</p> +}</pre> <p>This class defines a static logger variable. It then instantiates a Foo object. The Foo class is listed below: @@ -153,7 +157,7 @@ <a href="../xref/chapter3/Foo.html">(logback-examples/src/main/java/chapter3/Foo.java)</a> </em> - <p class="source">package chapter3; + <pre class="prettyprint source">package chapter3; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -164,7 +168,7 @@ public void doIt() { logger.debug("Did it again!"); } -}</p> +}</pre> <p>In order to run the examples in this chapter, you need to make @@ -220,7 +224,7 @@ (logback-examples/src/main/java/chapter3/sample0.xml)</em></p> -<div class="source"><pre><configuration> +<pre class="prettyprint source"><configuration> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> @@ -231,7 +235,7 @@ <root level="debug"> <appender-ref ref="STDOUT" /> </root> -</configuration></pre></div> +</configuration></pre> <p>After you have renamed <em>sample0.xml</em> as <em>logback.xml</em> (or <em>logback-test.xml</em>) place it into a @@ -253,14 +257,14 @@ href="../xref/chapter3/MyApp2.html">(logback-examples/src/main/java/chapter3/MyApp2.java)</a></em> -<div class="source"><pre> +<pre class="prettyprint lang-java source"> public static void main(String[] args) { // assume SLF4J is bound to logback in the current environment <b>LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();</b> // print logback's internal status <b>StatusPrinter.print(lc);</b> ... - }</pre></div> + }</pre> <p>If everything goes well, you should see the following output on the console</p> @@ -301,7 +305,7 @@ using debug mode (logback-examples/src/main/java/chapter3/sample1.xml)</em> -<div class="source"><pre> +<pre class="prettyprint source"> <configuration <b>debug="true"</b>> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> @@ -313,7 +317,7 @@ <root level="debug"> <appender-ref ref="STDOUT" /> </root> -</configuration></pre></div> +</configuration></pre> <p>Setting the <code>debug</code> attribute within the <configuration> element will output status information, under @@ -364,7 +368,7 @@ <code>JoranConfigurator</code> directly <a href="../xref/chapter3/MyApp3.html">(logback-examples/src/main/java/chapter3/MyApp3.java)</a></em></p> -<div class="source"><pre>package chapter3; +<pre class="prettyprint source">package chapter3; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -399,7 +403,7 @@ foo.doIt(); logger.info("Exiting application."); } -}</pre></div> +}</pre> <p>This application fetches the <code>LoggerContext</code> currently in effect, creates a new <code>JoranConfigurator</code>, @@ -443,7 +447,7 @@ <p>To add this servlet to your web-application, add the following lines to its <em>WEB-INF/web.xml</em> file.</p> - <p class="source"> <servlet> + <pre class="prettyprint source"> <servlet> <servlet-name>ViewStatusMessages</servlet-name> <servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet</servlet-class> </servlet> @@ -451,7 +455,7 @@ <servlet-mapping> <servlet-name>ViewStatusMessages</servlet-name> <url-pattern>/lbClassicStatus</url-pattern> - </servlet-mapping></p> + </servlet-mapping></pre> <p>The <code>ViewStatusMessages</code> servlet will viewable under the URL <code>http://host/yourWebapp/lbClassicStatus</code> @@ -485,10 +489,10 @@ StatusManager. </p> - <p class="source"> LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + <pre class="prettyprint source"> LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); StatusManager statusManager = lc.getStatusManager(); OnConsoleStatusListener onConsoleListener = new OnConsoleStatusListener(); - statusManager.add(onConsoleListener);</p> + statusManager.add(onConsoleListener);</pre> <p>Note that the registered status listener will receive status events subsequent to its registration. It will not receive prior @@ -499,11 +503,11 @@ <p><em>Example 3.<span class="autoEx"/>: Registering a status listener (logback-examples/src/main/java/chapter3/onConsoleStatusListener.xml)</em></p> - <p class="source"><configuration> + <pre class="prettyprint source"><configuration> <b><statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" /></b> ... the rest of the configuration file -</configuration></p> +</configuration></pre> <p>One may also register a status listener by setting the "logback.statusListenerClass" Java system property to the name of @@ -611,7 +615,7 @@ </p> <em>Example 3.<span class="autoEx"/>: Setting the level of a logger (logback-examples/src/main/java/chapter3/sample2.xml)</em> -<div class="source"><pre><configuration> +<pre class="prettyprint source"><configuration> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> @@ -627,14 +631,14 @@ <appender-ref ref="STDOUT" /> </root> -</configuration></pre></div> +</configuration></pre> <p>This new configuration will yield the following output, when invoked with the <em>MyApp3</em> application. </p> -<div class="source"><pre>17:34:07.578 [main] INFO chapter3.MyApp3 - Entering application. -17:34:07.578 [main] INFO chapter3.MyApp3 - Exiting application.</pre></div> +<pre class="source">17:34:07.578 [main] INFO chapter3.MyApp3 - Entering application. +17:34:07.578 [main] INFO chapter3.MyApp3 - Exiting application.</pre> <p>You can configure the levels of as many loggers as you wish. In the next configuration file, we set the level of the @@ -643,7 +647,7 @@ </p> <em>Example 3.<span class="autoEx"/>: Setting the level of multiple loggers (logback-examples/src/main/java/chapter3/sample3.xml)</em> -<div class="source"><pre><configuration> +<pre class="source prettyprint"><configuration> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> @@ -661,15 +665,15 @@ <appender-ref ref="STDOUT" /> </root> -</configuration></pre></div> +</configuration></pre> <p>Running <code>MyApp3</code> with this configuration file will result in the following output on the console: </p> -<div class="source"><pre>17:39:27.593 [main] INFO chapter3.MyApp3 - Entering application. +<p class="prettyprint source">17:39:27.593 [main] INFO chapter3.MyApp3 - Entering application. 17:39:27.593 [main] DEBUG chapter3.Foo - Did it again! -17:39:27.593 [main] INFO chapter3.MyApp3 - Exiting application.</pre></div> +17:39:27.593 [main] INFO chapter3.MyApp3 - Exiting application.</p> <p>The table below list the loggers and their levels, after <code>JoranConfigurator</code> has configured logback with the @@ -723,7 +727,7 @@ <em>Example 3.<span class="autoEx"/>: Logger level sample (logback-examples/src/main/java/chapter3/sample4.xml)</em> -<div class="source"><pre><configuration> +<pre class="prettyprint source"><configuration> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> @@ -741,7 +745,7 @@ <appender-ref ref="STDOUT" /> </root> -</configuration></pre></div> +</configuration></pre> <p>The following table lists the loggers and their levels after applying the <em>sample4.xml</em> configuration file. @@ -830,7 +834,7 @@ </p> <em>Example 3.<span class="autoEx"/>: Multiple loggers (logback-examples/src/main/java/chapter3/multiple.xml)</em> -<div class="source"><pre><configuration> +<pre class="prettyprint source"><configuration> <appender name="<b>FILE</b>" class="ch.qos.logback.core.FileAppender"> <file>myApp.log</file> @@ -851,7 +855,7 @@ <b><appender-ref ref="FILE" /> <appender-ref ref="STDOUT" /></b> </root> -</configuration></pre></div> +</configuration></pre> <p>This configuration scripts defines two appenders called <em>FILE</em> and <em>STDOUT</em>. The <em>FILE</em> appender logs @@ -880,7 +884,7 @@ <em>Example 3.<span class="autoEx"/>: Duplicate appender (logback-examples/src/main/java/chapter3/duplicate.xml)</em> -<div class="source"><pre><configuration> +<pre class="prettyprint source"><configuration> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> @@ -895,18 +899,18 @@ <root level="debug"> <appender-ref ref="STDOUT" /> </root> -</configuration></pre></div> +</configuration></pre> <p>Running <code>MyApp3</code> with <em>duplicate.xml</em> will yield the following output: </p> -<div class="source"><pre>14:25:36.343 [main] INFO chapter3.MyApp3 - Entering application. +<p class="source">14:25:36.343 [main] INFO chapter3.MyApp3 - Entering application. 14:25:36.343 [main] INFO chapter3.MyApp3 - Entering application. 14:25:36.359 [main] DEBUG chapter3.Foo - Did it again! 14:25:36.359 [main] DEBUG chapter3.Foo - Did it again! 14:25:36.359 [main] INFO chapter3.MyApp3 - Exiting application. -14:25:36.359 [main] INFO chapter3.MyApp3 - Exiting application.</pre></div> +14:25:36.359 [main] INFO chapter3.MyApp3 - Exiting application.</p> <p>Notice the duplicated output. The appender named <em>STDOUT</em> is attached to two loggers, to root and to <em>chapter3</em>. Since @@ -926,7 +930,7 @@ <em>Example 3.<span class="autoEx"/>: Multiple appender (logback-examples/src/main/java/chapter3/restricted.xml)</em> - <div class="source"><pre><configuration> + <pre class="prettyprint source"><configuration> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> <file>myApp.log</file> @@ -948,7 +952,7 @@ <root level="debug"> <appender-ref ref="STDOUT" /> </root> -</configuration></pre></div> +</configuration></pre> <p>In this example, the console appender will log all the messages (for all loggers in the system) whereas only logging request @@ -966,7 +970,7 @@ </p> <em>Example 3.<span class="autoEx"/>: Additivity flag (logback-examples/src/main/java/chapter3/additivityFlag.xml)</em> -<div class="source"><pre><configuration> +<pre class="prettyprint source"><configuration> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> <file>foo.log</file> @@ -988,7 +992,7 @@ <root level="debug"> <appender-ref ref="STDOUT" /> </root> -</configuration></pre></div> +</configuration></pre> <p>This example, the appender named <em>FILE</em> is attached to the <em>chapter3.Foo</em> logger. Moreover, the <em>chapter3.Foo</em> @@ -1028,7 +1032,7 @@ (logback-examples/src/main/java/chapter3/variableSubstitution1.xml) </em> - <div class="source"><pre><configuration> + <pre class="prettyprint source"><configuration> <b><property name="USER_HOME" value="/home/sebastien" /></b> @@ -1043,7 +1047,7 @@ <root level="debug"> <appender-ref ref="FILE" /> </root> -</configuration></pre></div> +</configuration></pre> <p>The next example shows the use of a System property to achieve @@ -1058,7 +1062,7 @@ (logback-examples/src/main/java/chapter3/variableSubstitution2.xml) </em> - <div class="source"><pre><configuration> + <pre class="prettyprint source"><configuration> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> @@ -1071,7 +1075,7 @@ <root level="debug"> <appender-ref ref="FILE" /> </root> -</configuration></pre></div> +</configuration></pre> <p>When multiple variables are needed, it may be more convenient to @@ -1084,7 +1088,7 @@ (logback-examples/src/main/java/chapter3/variableSubstitution3.xml) </em> - <div class="source"><pre><configuration> + <pre class="prettyprint source"><configuration> <b><property file="src/main/java/chapter3/variables1.properties" /></b> @@ -1099,7 +1103,7 @@ <root level="debug"> <appender-ref ref="FILE" /> </root> -</configuration></pre></div> +</configuration></pre> <p>This configuration file contains a reference to a file named <em>variables1.properties</em>. The variables contained in that @@ -1111,12 +1115,12 @@ <em>Example 3.<span class="autoEx"/>: Variable file (logback-examples/src/main/java/chapter3/variables1.properties)</em> - <div class="source"><pre>USER_HOME=/home/sebastien</pre></div> + <pre class="source">USER_HOME=/home/sebastien</pre> <p>You may also reference a resource on the class path instead of a file.</p> - <div class="source"><pre><configuration> + <pre class="prettyprint source"><configuration> <b><property resource="resource1.properties" /></b> @@ -1131,10 +1135,7 @@ <root level="debug"> <appender-ref ref="FILE" /> </root> -</configuration></pre></div> - - - +</configuration></pre> <h4>Nested variable substitution</h4> @@ -1150,9 +1151,9 @@ <em>Example 3.<span class="autoEx"/>: Nested variable references (logback-examples/src/main/java/chapter3/variables2.properties)</em> - <div class="source"><pre>USER_HOME=/home/sebastien + <pre class="source">USER_HOME=/home/sebastien fileName=myApp.log -<b>destination=${USER_HOME}/${fileName}</b></pre></div> +<b>destination=${USER_HOME}/${fileName}</b></pre> <p>Note that in the properties file above, "destination" is composed out of two other variables, namely "USER_HOME" and @@ -1163,7 +1164,7 @@ a separate file (logback-examples/src/main/java/chapter3/variableSubstitution4.xml)</em> - <div class="source"><pre><configuration> + <pre class="prettyprint source"><configuration> <property file="variables2.properties" /> @@ -1178,7 +1179,7 @@ <root level="debug"> <appender-ref ref="FILE" /> </root> -</configuration></pre></div> +</configuration></pre> <h4><a name="defaultValuesForVariables" href="#defaultValuesForVariables">Default substitution values for @@ -1206,14 +1207,14 @@ <em>Example 3.<span class="autoEx"/>: File include (logback-examples/src/main/java/chapter3/containingConfig.xml)</em> - <div class="source"><pre><configuration> + <pre class="prettyprint source"><configuration> <b><include file="src/main/java/chapter3/includedConfig.xml"/></b> <root level="DEBUG"> <appender-ref ref="includedConsole" /> </root> -</configuration></pre></div> +</configuration></pre> <p>The target file MUST have its elements nested inside an <code><included></code> element. For example, a @@ -1223,13 +1224,13 @@ <em>Example 3.<span class="autoEx"/>: File include (logback-examples/src/main/java/chapter3/includedConfig.xml)</em> - <p class="source"><b class="green"><included></b> + <pre class="source"><b class="green big"><included></b> <appender name="includedConsole" class="ch.qos.logback.core.ConsoleAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>"%d - %m%n"</Pattern> </layout> </appender> -<b class="green"></included></b></p> +<b class="green big"></included></b></pre> <p>The file to be included can be referenced as a file, as a URL or as a resource. To reference a file use the <span @@ -1255,7 +1256,7 @@ <em>Example 3.<span class="autoEx"/>: Set the context name and display it (logback-examples/src/main/java/chapter3/contextName.xml)</em> - <p class="source"><configuration> + <pre class="prettyprint source"><configuration> <b><contextName>myAppName</contextName></b> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> @@ -1266,7 +1267,7 @@ <root level="debug"> <appender-ref ref="STDOUT" /> </root> -</configuration></p> +</configuration></pre> <p>This last examples illustrates naming of the logger context. Adding the the <a @@ -1285,7 +1286,7 @@ <em>Example 3.<span class="autoEx"/>: Insert as properties env-entries obtained via JNDI (logback-examples/src/main/java/chapter3/insertFromJNDI.xml)</em> - <p class="source"><configuration> + <pre class="prettyprint source"><configuration> <b><insertFromJNDI env-entry-name="java:comp/env/appName" as="<span class="green">appName"</span> /></b> <b><contextName><span class="green">${appName}</span></contextName></b> @@ -1298,7 +1299,7 @@ <root level="DEBUG"> <appender-ref ref="CONSOLE" /> </root> -</configuration></p> +</configuration></pre> <p>In this last example, the "java:comp/env/appName" env-entry is inserted as the <span class="variable">appName</span> property. Note Modified: logback/trunk/logback-site/src/site/pages/templates/creative.js ============================================================================== --- logback/trunk/logback-site/src/site/pages/templates/creative.js (original) +++ logback/trunk/logback-site/src/site/pages/templates/creative.js Tue Jul 14 19:23:48 2009 @@ -1,11 +1,11 @@ -document.write(' <table style="margin-left: 0em; padding-top=0ex" cellpadding="0" '); +document.write(' <table style="margin-left: 0em; padding-top:0ex" cellpadding="0" '); document.write(' cellspacing="0" width="70%">'); document.write(' <tr>'); document.write(' <td> '); document.write(' <p class="author">'); document.write(' Authors: Ceki Gülcü, Sébastien Pennec'); document.write(' <br/>'); -document.write(' Copyright © 2000-2008, QOS.ch</p>'); +document.write(' Copyright © 2000-2009, QOS.ch</p>'); document.write(' </td>'); document.write(' <td>'); document.write(' <a rel="license"');

1 0

svn commit: r2346 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/joran test/java/ch/qos/logback/core/rolling
by noreply.ceki＠qos.ch 14 Jul '09

14 Jul '09

Author: ceki Date: Tue Jul 14 18:37:23 2009 New Revision: 2346 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java Log: very minor changes Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java Tue Jul 14 18:37:23 2009 @@ -59,7 +59,7 @@ final public void doConfigure(File file) throws JoranException { FileInputStream fis = null; try { - informContextOfURLUsedForConfiguration(file.toURL()); + informContextOfURLUsedForConfiguration(file.toURI().toURL()); fis = new FileInputStream(file); doConfigure(fis); } catch (IOException ioe) { Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java Tue Jul 14 18:37:23 2009 @@ -13,7 +13,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import org.junit.After; import org.junit.Before;

1 0

svn commit: r2345 - logback/trunk
by noreply.ceki＠qos.ch 14 Jul '09

14 Jul '09

Author: ceki Date: Tue Jul 14 17:00:13 2009 New Revision: 2345 Modified: logback/trunk/pom.xml Log: upgrade to SLF4J 1.5.8 Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Tue Jul 14 17:00:13 2009 @@ -36,7 +36,7 @@ <properties>  - <slf4j.version>1.5.6</slf4j.version> + <slf4j.version>1.5.8</slf4j.version> <consolePlugin.version>1.1.0</consolePlugin.version> </properties>

1 0

svn commit: r2344 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/joran/action main/java/ch/qos/logback/classic/turbo test/input/joran test/java/ch/qos/logback/classic/joran
by noreply.ceki＠qos.ch 14 Jul '09

14 Jul '09

Author: ceki Date: Tue Jul 14 16:59:25 2009 New Revision: 2344 Added: logback/trunk/logback-classic/src/test/input/joran/scan1.xml Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ConfigurationAction.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Log: Adding support for automatic reconfiguration. Related to LBCORE-59 This implementation checks for changes in the config file every N seconds, where N is a user specified parameter. However, as a performance twist, the check is performed every 16 logging events. It's still ongoing work Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ConfigurationAction.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ConfigurationAction.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ConfigurationAction.java Tue Jul 14 16:59:25 2009 @@ -1,7 +1,7 @@ /** - * LOGBack: the generic, reliable, fast and flexible logging framework. + * Logback: the generic, reliable, fast and flexible logging framework. * - * Copyright (C) 1999-2006, QOS.ch + * Copyright (C) 2000-2009, 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 @@ -13,42 +13,73 @@ import org.xml.sax.Attributes; import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.turbo.ReconfigureOnChangeFilter; import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.spi.InterpretationContext; +import ch.qos.logback.core.util.Duration; +import ch.qos.logback.core.util.OptionHelper; import ch.qos.logback.core.util.StatusPrinter; - - public class ConfigurationAction extends Action { static final String INTERNAL_DEBUG_ATTR = "debug"; + static final String SCAN_ATTR = "scan"; + static final String SCAN_PERIOD_ATTR = "scanPeriod"; + boolean debugMode = false; public void begin(InterpretationContext ec, String name, Attributes attributes) { String debugAttrib = attributes.getValue(INTERNAL_DEBUG_ATTR); - if ( - (debugAttrib == null) || debugAttrib.equals("") - || debugAttrib.equals("false") || debugAttrib.equals("null")) { + if (OptionHelper.isEmpty(debugAttrib) + || debugAttrib.equalsIgnoreCase("false") + || debugAttrib.equalsIgnoreCase("null")) { addInfo(INTERNAL_DEBUG_ATTR + " attribute not set"); } else { - //LoggerContext loggerContext = (LoggerContext) context; - //ConfiguratorBase.attachTemporaryConsoleAppender(context); - + // LoggerContext loggerContext = (LoggerContext) context; + // ConfiguratorBase.attachTemporaryConsoleAppender(context); + debugMode = true; } - - // the context is turbo filter attachable, so it is pushed on top of the stack + + processScanAttrib(attributes); + + // the context is turbo filter attachable, so it is pushed on top of the + // stack ec.pushObject(getContext()); } + void processScanAttrib(Attributes attributes) { + String scanAttrib = attributes.getValue(SCAN_ATTR); + if (!OptionHelper.isEmpty(scanAttrib) + && !"false".equalsIgnoreCase(scanAttrib)) { + ReconfigureOnChangeFilter rocf = new ReconfigureOnChangeFilter(); + rocf.setContext(context); + String scanPeriodAttrib = attributes.getValue(SCAN_PERIOD_ATTR); + if (!OptionHelper.isEmpty(scanPeriodAttrib)) { + try { + Duration duration = Duration.valueOf(scanPeriodAttrib); + rocf.setRefreshPeriod(duration.getMilliseconds()); + addInfo("Setting ReconfigureOnChangeFilter scanning period to " + + duration); + } catch (NumberFormatException nfe) { + addError("Error while converting [" + scanAttrib + "] to long", nfe); + } + } + rocf.start(); + LoggerContext lc = (LoggerContext) context; + addInfo("Adding ReconfigureOnChangeFilter as a turbo filter"); + lc.addTurboFilter(rocf); + } + } + public void end(InterpretationContext ec, String name) { if (debugMode) { addInfo("End of configuration."); LoggerContext loggerContext = (LoggerContext) context; StatusPrinter.print(loggerContext); - - //LoggerContext loggerContext = (LoggerContext) context; - //ConfiguratorBase.detachTemporaryConsoleAppender(repository, errorList); + + // LoggerContext loggerContext = (LoggerContext) context; + // ConfiguratorBase.detachTemporaryConsoleAppender(repository, errorList); } ec.popObject(); } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java Tue Jul 14 16:59:25 2009 @@ -36,10 +36,11 @@ protected long nextCheck; long lastModified; + @Override public void start() { URL url = (URL) context.getObject(CoreConstants.URL_OF_LAST_CONFIGURATION_VIA_JORAN); - if(url == null) { + if(url != null) { fileToScan = convertToFile(url); if(fileToScan != null) { long inSeconds = refreshPeriod/1000; @@ -64,14 +65,26 @@ } } + // a counter of the number of time the decide method is called + private volatile int invocationCounter = 0; + @Override public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { if(!isStarted()) { return FilterReply.NEUTRAL; } + System.out.println("counter="+invocationCounter+", format="+format); + // for performance reasons, check for changes every 16 invocations + if(((invocationCounter++) & 0xF) != 0xF) { + return FilterReply.NEUTRAL; + } + + boolean changed = changeDetected(); if(changed) { + addInfo("["+fileToScan + "] change detected. Reconfiguring"); + addInfo("Resetting and reconfiguring context ["+context.getName()+"]"); reconfigure(); } return FilterReply.NEUTRAL; @@ -102,4 +115,12 @@ addError("Failure during reconfiguration", e); } } + + public long getRefreshPeriod() { + return refreshPeriod; + } + + public void setRefreshPeriod(long refreshPeriod) { + this.refreshPeriod = refreshPeriod; + } } Added: logback/trunk/logback-classic/src/test/input/joran/scan1.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/joran/scan1.xml Tue Jul 14 16:59:25 2009 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration scan="true" scanPeriod="1 millisecond"> + + <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>yx %d - %m%n"</Pattern> + </layout> + </appender> + + <root level="TRACE"> + <appender-ref ref="CONSOLE" /> + </root> + +</configuration> + \ No newline at end of file Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Tue Jul 14 16:59:25 2009 @@ -13,6 +13,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.io.File; +import java.io.IOException; + import org.junit.Test; import org.slf4j.MDC; @@ -27,7 +30,9 @@ import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.read.ListAppender; +import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.testUtil.StringListAppender; +import ch.qos.logback.core.util.StatusPrinter; public class JoranConfiguratorTest { @@ -67,12 +72,14 @@ } @Test - public void testRootLoggerLevelSettingBySystemProperty() throws JoranException { + public void testRootLoggerLevelSettingBySystemProperty() + throws JoranException { String propertyName = "logback.level"; - + System.setProperty(propertyName, "INFO"); - configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/rootLevelByProperty.xml"); - //StatusPrinter.print(loggerContext); + configure(TeztConstants.TEST_DIR_PREFIX + + "input/joran/rootLevelByProperty.xml"); + // StatusPrinter.print(loggerContext); ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); String msg = "hello world"; @@ -80,14 +87,15 @@ assertEquals(0, listAppender.list.size()); System.clearProperty(propertyName); } - + @Test public void testLoggerLevelSettingBySystemProperty() throws JoranException { String propertyName = "logback.level"; - + System.setProperty(propertyName, "DEBUG"); - configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/loggerLevelByProperty.xml"); - //StatusPrinter.print(loggerContext); + configure(TeztConstants.TEST_DIR_PREFIX + + "input/joran/loggerLevelByProperty.xml"); + // StatusPrinter.print(loggerContext); ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); String msg = "hello world"; @@ -95,11 +103,11 @@ assertEquals(1, listAppender.list.size()); System.clearProperty(propertyName); } - + @Test public void testStatusListener() throws JoranException { configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/statusListener.xml"); - //StatusPrinter.print(loggerContext); + // StatusPrinter.print(loggerContext); } @Test @@ -108,7 +116,7 @@ configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/contextRename.xml"); assertEquals("wombat", loggerContext.getName()); } - + @Test public void testEval() throws JoranException { configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/callerData.xml"); @@ -122,7 +130,7 @@ assertNotNull(slAppender); assertEquals(2, slAppender.strList.size()); assertTrue(slAppender.strList.get(0).contains(" DEBUG - toto")); - + String str1 = slAppender.strList.get(1); assertTrue(str1.contains("Caller+0")); assertTrue(str1.contains(" DEBUG - hello world")); @@ -159,7 +167,7 @@ public void testLevelFilter() throws JoranException { configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/levelFilter.xml"); - //StatusPrinter.print(loggerContext); + // StatusPrinter.print(loggerContext); logger.warn("hello"); logger.error("to be ignored"); @@ -179,7 +187,7 @@ public void testEvaluatorFilter() throws JoranException { configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/evaluatorFilter.xml"); - //StatusPrinter.print(loggerContext); + // StatusPrinter.print(loggerContext); logger.warn("hello"); logger.error("to be ignored"); @@ -239,4 +247,26 @@ le = (ILoggingEvent) listAppender.list.get(1); assertEquals("hello user2", le.getMessage()); } + + @Test + public void scan1() throws JoranException, IOException, InterruptedException { + + String configFileAsStr = TeztConstants.TEST_DIR_PREFIX + + "input/joran/scan1.xml"; + configure(configFileAsStr); + + File file = new File(configFileAsStr); + file.setLastModified(System.currentTimeMillis()); + + // scanning requires 16 logs + for (int i = 0; i < 16; i++) { + logger.debug("after " + i); + } + + StatusChecker checker = new StatusChecker(loggerContext); + assertTrue(checker.isErrorFree()); + assertTrue(checker.containsMatch("Resetting and reconfiguring context")); + StatusPrinter.print(loggerContext); + + } }

1 0

svn commit: r2343 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/util test/java/ch/qos/logback/core/status test/java/ch/qos/logback/core/util
by noreply.ceki＠qos.ch 14 Jul '09

14 Jul '09

Author: ceki Date: Tue Jul 14 16:59:15 2009 New Revision: 2343 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Duration.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/DurationTest.java Log: Adding support for automatic reconfiguration. Related to LBCORE-59 This implementation checks for changes in the config file every N seconds, where N is a user specified parameter. However, as a performance twist, the check is performed every 16 logging events. It's still ongoing work Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Duration.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Duration.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Duration.java Tue Jul 14 16:59:15 2009 @@ -13,14 +13,15 @@ import java.util.regex.Pattern; /** - * Duration instances represent a lapse of time. Internally, the duration is stored - * in milliseconds. + * Duration instances represent a lapse of time. Internally, the duration is + * stored in milliseconds. * <p> * - * The {@link #valueOf} method can convert strings such as "3.5 minutes", "5 hours", into - * Duration instances. The recognized units of time are the "millisecond", "second", "minute" - * "hour" and "day". The unit name may be followed by an "s". Thus, "2 day" and "2 days" are - * equivalent. In the absence of a time unit specification, milliseconds are assumed. + * The {@link #valueOf} method can convert strings such as "3.5 minutes", "5 + * hours", into Duration instances. The recognized units of time are the + * "millisecond", "second", "minute" "hour" and "day". The unit name may be + * followed by an "s". Thus, "2 day" and "2 days" are equivalent. In the absence + * of a time unit specification, milliseconds are assumed. * * * @author Ceki Gulcu @@ -30,7 +31,7 @@ private final static String DOUBLE_PART = "([0-9]*(.[0-9]+)?)"; private final static int DOUBLE_GROUP = 1; - private final static String UNIT_PART = "(|millisecond|second(e)?|minute|hour|day)s?"; + private final static String UNIT_PART = "(|milli(second)?|second(e)?|minute|hour|day)s?"; private final static int UNIT_GROUP = 3; private static final Pattern DURATION_PATTERN = Pattern.compile(DOUBLE_PART @@ -50,27 +51,27 @@ public static Duration buildByMilliseconds(double value) { return new Duration((long) (value)); } - + public static Duration buildBySeconds(double value) { - return new Duration((long) (SECONDS_COEFFICIENT*value)); + return new Duration((long) (SECONDS_COEFFICIENT * value)); } public static Duration buildByMinutes(double value) { - return new Duration((long) (MINUTES_COEFFICIENT*value)); + return new Duration((long) (MINUTES_COEFFICIENT * value)); } - + public static Duration buildByHours(double value) { - return new Duration((long) (HOURS_COEFFICIENT*value)); + return new Duration((long) (HOURS_COEFFICIENT * value)); } public static Duration buildByDays(double value) { - return new Duration((long) (DAYS_COEFFICIENT*value)); + return new Duration((long) (DAYS_COEFFICIENT * value)); } public static Duration buildUnbounded() { return new Duration(Long.MAX_VALUE); } - + public long getMilliseconds() { return millis; } @@ -83,9 +84,11 @@ String unitStr = matcher.group(UNIT_GROUP); double doubleValue = Double.valueOf(doubleStr); - if (unitStr.equalsIgnoreCase("millisecond") || unitStr.length() == 0) { + if (unitStr.equalsIgnoreCase("milli") + || unitStr.equalsIgnoreCase("millisecond") || unitStr.length() == 0) { return buildByMilliseconds(doubleValue); - } else if (unitStr.equalsIgnoreCase("second") || unitStr.equalsIgnoreCase("seconde")) { + } else if (unitStr.equalsIgnoreCase("second") + || unitStr.equalsIgnoreCase("seconde")) { return buildBySeconds(doubleValue); } else if (unitStr.equalsIgnoreCase("minute")) { return buildByMinutes(doubleValue); @@ -94,25 +97,25 @@ } else if (unitStr.equalsIgnoreCase("day")) { return buildByDays(doubleValue); } else { - throw new IllegalStateException("Unexpected" + unitStr); + throw new IllegalStateException("Unexpected " + unitStr); } } else { throw new IllegalArgumentException("String value [" + durationStr + "] is not in the expected format."); } } - + @Override public String toString() { - if(millis < SECONDS_COEFFICIENT) { + if (millis < SECONDS_COEFFICIENT) { return millis + " milliseconds"; - } else if (millis < MINUTES_COEFFICIENT){ - return millis/SECONDS_COEFFICIENT +" seconds"; - } else if(millis < HOURS_COEFFICIENT) { - return millis/MINUTES_COEFFICIENT +" minutes"; + } else if (millis < MINUTES_COEFFICIENT) { + return millis / SECONDS_COEFFICIENT + " seconds"; + } else if (millis < HOURS_COEFFICIENT) { + return millis / MINUTES_COEFFICIENT + " minutes"; } else { - return millis/HOURS_COEFFICIENT+" hours"; + return millis / HOURS_COEFFICIENT + " hours"; } - + } } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java Tue Jul 14 16:59:15 2009 @@ -13,8 +13,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import ch.qos.logback.core.status.Status; -import ch.qos.logback.core.status.StatusManager; +import ch.qos.logback.core.Context; public class StatusChecker { @@ -24,6 +23,10 @@ this.sm = sm; } + public StatusChecker(Context context) { + this.sm = context.getStatusManager(); + } + public boolean isErrorFree() { int level = sm.getLevel(); return level < Status.ERROR; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/DurationTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/DurationTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/DurationTest.java Tue Jul 14 16:59:15 2009 @@ -27,6 +27,16 @@ Duration d = Duration.valueOf("12"); assertEquals(12, d.getMilliseconds()); } + + { + Duration d = Duration.valueOf("159 milli"); + assertEquals(159, d.getMilliseconds()); + } + + { + Duration d = Duration.valueOf("15 millis"); + assertEquals(15, d.getMilliseconds()); + } { Duration d = Duration.valueOf("8 milliseconds");

1 0