- logback-dev - mailman3.qos.ch

branch, master, updated. 0334b5b0597eeb09a5319a00c69c1867a17b5b2f
by git-noreply＠pixie.qos.ch 12 Nov '09

12 Nov '09

The branch, master has been updated via 0334b5b0597eeb09a5319a00c69c1867a17b5b2f (commit) from 043fe3b6471a4025911da4a78d28fc41cd775038 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=0334b5b0597eeb09a5319a00… http://github.com/ceki/logback/commit/0334b5b0597eeb09a5319a00c69c1867a17b5… commit 0334b5b0597eeb09a5319a00c69c1867a17b5b2f Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Nov 13 00:06:19 2009 +0100 - made the import declerations for janino and javax options as suggested by DAvid Varnes in LBCORE-101 diff --git a/logback-core/pom.xml b/logback-core/pom.xml index cddf12f..873db19 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -135,7 +135,11 @@ <configuration> <instructions> <Export-Package>ch.qos.logback.core.*</Export-Package> - <Import-Package>org.codehaus.janino;resolution:=optional,*</Import-Package> + <Import-Package> + javax.*;resolution:=optional, + org.codehaus.janino;resolution:=optional, + * + </Import-Package> <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> </instructions> </configuration> ----------------------------------------------------------------------- Summary of changes: logback-core/pom.xml | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. 043fe3b6471a4025911da4a78d28fc41cd775038
by git-noreply＠pixie.qos.ch 12 Nov '09

12 Nov '09

The branch, master has been updated via 043fe3b6471a4025911da4a78d28fc41cd775038 (commit) from 4cdca9f671ff8251e7775fee498a7331328ffa5b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=043fe3b6471a4025911da4a7… http://github.com/ceki/logback/commit/043fe3b6471a4025911da4a78d28fc41cd775… commit 043fe3b6471a4025911da4a78d28fc41cd775038 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Nov 12 01:22:45 2009 +0100 - minor refactoring in DefaultArchiver and SizeAndTimeBasedArchiveRemover - Adapted TimeBasedRollingWithArchiveRemovalTest so that dailySizeBasedRollover() no longer fails under certain circumstances, e.g. when in the last period no size-based rollover occuers. Also increased the number of ticks per period (more logging calls) and increased the triggering size (less size-based rollovers for faster test execution time) diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java index 6640853..c18b53c 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java @@ -23,7 +23,7 @@ public class DefaultArchiveRemover implements ArchiveRemover { final FileNamePattern fileNamePattern; final RollingCalendar rc; - int periodOffset; + int periodOffsetForDeletionTarget; final boolean parentClean; public DefaultArchiveRemover(FileNamePattern fileNamePattern, @@ -67,7 +67,7 @@ public class DefaultArchiveRemover implements ArchiveRemover { } public void clean(Date now) { - Date date2delete = rc.getRelativeDate(now, periodOffset); + Date date2delete = rc.getRelativeDate(now, periodOffsetForDeletionTarget); String filename = fileNamePattern.convert(date2delete); File file2Delete = new File(filename); if (file2Delete.exists() && file2Delete.isFile()) { @@ -98,7 +98,7 @@ public class DefaultArchiveRemover implements ArchiveRemover { } public void setMaxHistory(int maxHistory) { - this.periodOffset = -maxHistory - 1; + this.periodOffsetForDeletionTarget = -maxHistory - 1; } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java index a9cdfdc..c5efefd 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java @@ -145,9 +145,7 @@ public class FileNamePattern extends ContextAwareBase { } /** - * Given date, convert this instance to a regular expression. A - * slashified regex, is a regex with naturally occurring forward slash - * characters replaced by back slashes. + * Given date, convert this instance to a regular expression. */ public String toRegex(Date date) { StringBuilder buf = new StringBuilder(); diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java index 66d7513..397ad9a 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java @@ -25,7 +25,7 @@ public class SizeAndTimeBasedArchiveRemover extends DefaultArchiveRemover { @Override public void clean(Date now) { - Date dateOfPeriodToClean = rc.getRelativeDate(now, periodOffset); + Date dateOfPeriodToClean = rc.getRelativeDate(now, periodOffsetForDeletionTarget); String regex = fileNamePattern.toRegex(dateOfPeriodToClean); String stemRegex = FileFilterUtil.afterLastSlash(regex); diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java index af4a068..2e2e27a 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java @@ -104,7 +104,7 @@ public class TimeBasedRollingWithArchiveRemovalTest { slashCount = computeSlashCount(MONTHLY_CROLOLOG_DATE_PATTERN); int numPeriods = 40; int maxHistory = 2; - + doRollover(randomOutputDir + "/%d{" + MONTHLY_CROLOLOG_DATE_PATTERN + "}/clean.txt.zip", MILLIS_IN_MONTH, maxHistory, numPeriods); int beginPeriod = Calendar.getInstance().get(Calendar.MONTH); @@ -136,21 +136,25 @@ public class TimeBasedRollingWithArchiveRemovalTest { @Test public void dailySizeBasedRollover() throws Exception { SizeAndTimeBasedFNATP<Object> sizeAndTimeBasedFNATP = new SizeAndTimeBasedFNATP<Object>(); - sizeAndTimeBasedFNATP.setMaxFileSize("10"); + sizeAndTimeBasedFNATP.setMaxFileSize("10000"); tbfnatp = sizeAndTimeBasedFNATP; slashCount = computeSlashCount(DAILY_DATE_PATTERN); doRollover( randomOutputDir + "/%d{" + DAILY_DATE_PATTERN + "}-clean.%i.zip", MILLIS_IN_DAY, 5, 5 * 4); + + // make .zip optional so that if for one reason or another, no size-based + // rollover occurs on the last period, that the last period is still accounted + // for checkPatternCompliance(5 + 1 + slashCount, - "\\d{4}-\\d{2}-\\d{2}-clean.(\\d).zip"); + "\\d{4}-\\d{2}-\\d{2}-clean.(\\d)(.zip)?"); } @Test public void dailyChronologSizeBasedRollover() throws Exception { SizeAndTimeBasedFNATP<Object> sizeAndTimeBasedFNATP = new SizeAndTimeBasedFNATP<Object>(); - sizeAndTimeBasedFNATP.setMaxFileSize("10"); + sizeAndTimeBasedFNATP.setMaxFileSize("10000"); tbfnatp = sizeAndTimeBasedFNATP; slashCount = 1; @@ -180,19 +184,22 @@ public class TimeBasedRollingWithArchiveRemovalTest { rfa.setRollingPolicy(tbrp); rfa.start(); - int ticksPerPeriod = 64; + // lots of ticks per period + int ticksPerPeriod = 512; long runLength = simulatedNumberOfPeriods * ticksPerPeriod; - for (long i = 0; i < runLength; i++) { + long i = 0; + for (; i < runLength; i++) { rfa .doAppend("Hello ----------------------------------------------------------" + i); tbrp.timeBasedTriggering.setCurrentTime(addTime(tbrp.timeBasedTriggering .getCurrentTime(), periodDurationInMillis / ticksPerPeriod)); - if (tbrp.future != null) { - tbrp.future.get(200, TimeUnit.MILLISECONDS); - } + } + + if (tbrp.future != null && !tbrp.future.isDone()) { + tbrp.future.get(200, TimeUnit.MILLISECONDS); } rfa.stop(); } @@ -324,6 +331,9 @@ public class TimeBasedRollingWithArchiveRemovalTest { assertEquals(expectedClassCount, fileList.size()); } + // reduce file names differing by index number into the same group + // for example, 2009-11-01-clean-0.zip, 2009-11-01-clean-1.zip and + // 2009-11-01-clean-2 are reduced into the same string (group) Set<String> groupByClass(List<File> fileList, String regex) { Pattern p = Pattern.compile(regex); Set<String> set = new HashSet<String>(); @@ -333,7 +343,8 @@ public class TimeBasedRollingWithArchiveRemovalTest { m.matches(); int begin = m.start(1); int end = m.end(1); - set.add(n.substring(0, begin) + n.substring(end)); + String reduced = n.substring(0, begin) + n.substring(end); + set.add(reduced); } return set; } ----------------------------------------------------------------------- Summary of changes: .../core/rolling/helper/DefaultArchiveRemover.java | 6 ++-- .../core/rolling/helper/FileNamePattern.java | 4 +-- .../helper/SizeAndTimeBasedArchiveRemover.java | 2 +- .../TimeBasedRollingWithArchiveRemovalTest.java | 31 +++++++++++++------ 4 files changed, 26 insertions(+), 17 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. 4cdca9f671ff8251e7775fee498a7331328ffa5b
by git-noreply＠pixie.qos.ch 11 Nov '09

11 Nov '09

The branch, master has been updated via 4cdca9f671ff8251e7775fee498a7331328ffa5b (commit) from b3f2333b924d4c811059863e92c5b7742580fe47 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=4cdca9f671ff8251e7775fee… http://github.com/ceki/logback/commit/4cdca9f671ff8251e7775fee498a7331328ff… commit 4cdca9f671ff8251e7775fee498a7331328ffa5b Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Nov 11 09:02:45 2009 +0100 - instead of hardcoding, have logback-classic's MANIFEST reference/export slf4j by variable. diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index f7e1bd7..b460fb3 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -208,7 +208,7 @@ </executions> <configuration> <instructions> - <Export-Package>ch.qos.logback.classic*, org.slf4j.impl;version=1.5.6</Export-Package> + <Export-Package>ch.qos.logback.classic*, org.slf4j.impl;version=${slf4j.version}</Export-Package>  - <slf4j.version>1.5.8</slf4j.version> +  + <slf4j.version>1.5.9.RC1</slf4j.version> <consolePlugin.version>1.1.0</consolePlugin.version> </properties> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 2 +- pom.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-165) Wrong MANIFEST.MF Private-Package and Export-Package sections
by Bulat Nigmatullin (JIRA) 10 Nov '09

10 Nov '09

Wrong MANIFEST.MF Private-Package and Export-Package sections ------------------------------------------------------------- Key: LBCLASSIC-165 URL: http://jira.qos.ch/browse/LBCLASSIC-165 Project: logback-classic Issue Type: Bug Components: joran Affects Versions: 0.917 Reporter: Bulat Nigmatullin Assignee: Logback dev list I'm trying to setup logback configuration loading in accordance with http://logback.qos.ch/xref/chapter3/MyApp3.html . When running in OSGi Framework i have the following error: Error while starting bundle: file:/home/bulat/Desktop/xmppserver/lib/log-0.2.jar: org.osgi.framework.BundleException: Unresolved constraint in bundle ru.rambler.xmpp.server.util.log [13]: package; (package=ch.qos.logback.classic) Package ch.qos.logback.classic and ch.qos.logback.classic.joran and may be many others should be in Export-Package section of MANIFEST.MF -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

4 10

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

10 Nov '09

The branch, master has been updated via b3f2333b924d4c811059863e92c5b7742580fe47 (commit) from baba96b8e2a916ecee6d3fda41c7040535f5b175 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=b3f2333b924d4c811059863e… http://github.com/ceki/logback/commit/b3f2333b924d4c811059863e92c5b7742580f… commit b3f2333b924d4c811059863e92c5b7742580fe47 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 10 22:20:58 2009 +0100 - minor adjustments in the comments - editing of filters.html diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java index 232c689..0bfd020 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java @@ -28,22 +28,20 @@ import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.boolex.JaninoEventEvaluatorBase; import ch.qos.logback.core.boolex.Matcher; +public class JaninoEventEvaluator extends + JaninoEventEvaluatorBase<ILoggingEvent> { - -public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent> { - - public final static String IMPORT_LEVEL = "import ch.qos.logback.classic.Level;\r\n"; - + public final static List<String> DEFAULT_PARAM_NAME_LIST = new ArrayList<String>(); public final static List<Class> DEFAULT_PARAM_TYPE_LIST = new ArrayList<Class>(); - + static { DEFAULT_PARAM_NAME_LIST.add("DEBUG"); DEFAULT_PARAM_NAME_LIST.add("INFO"); DEFAULT_PARAM_NAME_LIST.add("WARN"); DEFAULT_PARAM_NAME_LIST.add("ERROR"); - + DEFAULT_PARAM_NAME_LIST.add("event"); DEFAULT_PARAM_NAME_LIST.add("message"); @@ -56,12 +54,12 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent DEFAULT_PARAM_NAME_LIST.add("mdc"); DEFAULT_PARAM_NAME_LIST.add("throwableProxy"); DEFAULT_PARAM_NAME_LIST.add("throwable"); - + DEFAULT_PARAM_TYPE_LIST.add(int.class); DEFAULT_PARAM_TYPE_LIST.add(int.class); DEFAULT_PARAM_TYPE_LIST.add(int.class); DEFAULT_PARAM_TYPE_LIST.add(int.class); - + DEFAULT_PARAM_TYPE_LIST.add(ILoggingEvent.class); DEFAULT_PARAM_TYPE_LIST.add(String.class); DEFAULT_PARAM_TYPE_LIST.add(String.class); @@ -74,11 +72,11 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent DEFAULT_PARAM_TYPE_LIST.add(IThrowableProxy.class); DEFAULT_PARAM_TYPE_LIST.add(Throwable.class); } - - + public JaninoEventEvaluator() { - + } + protected String getDecoratedExpression() { return IMPORT_LEVEL + getExpression(); } @@ -87,18 +85,18 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent List<String> fullNameList = new ArrayList<String>(); fullNameList.addAll(DEFAULT_PARAM_NAME_LIST); - for(int i = 0; i < matcherList.size(); i++) { + for (int i = 0; i < matcherList.size(); i++) { Matcher m = (Matcher) matcherList.get(i); fullNameList.add(m.getName()); } - + return (String[]) fullNameList.toArray(CoreConstants.EMPTY_STRING_ARRAY); } protected Class[] getParameterTypes() { List<Class> fullTypeList = new ArrayList<Class>(); fullTypeList.addAll(DEFAULT_PARAM_TYPE_LIST); - for(int i = 0; i < matcherList.size(); i++) { + for (int i = 0; i < matcherList.size(); i++) { fullTypeList.add(Matcher.class); } return (Class[]) fullTypeList.toArray(CoreConstants.EMPTY_CLASS_ARRAY); @@ -106,30 +104,34 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent protected Object[] getParameterValues(ILoggingEvent loggingEvent) { final int matcherListSize = matcherList.size(); - + int i = 0; - Object[] values = new Object[DEFAULT_PARAM_NAME_LIST.size()+matcherListSize]; + Object[] values = new Object[DEFAULT_PARAM_NAME_LIST.size() + + matcherListSize]; values[i++] = Level.DEBUG_INTEGER; values[i++] = Level.INFO_INTEGER; values[i++] = Level.WARN_INTEGER; values[i++] = Level.ERROR_INTEGER; - + values[i++] = loggingEvent; - values[i++] = loggingEvent.getMessage(); - values[i++] = loggingEvent.getFormattedMessage(); + values[i++] = loggingEvent.getMessage(); + values[i++] = loggingEvent.getFormattedMessage(); values[i++] = loggingEvent.getLoggerName(); values[i++] = loggingEvent.getLoggerContextVO(); values[i++] = loggingEvent.getLevel().toInteger(); values[i++] = new Long(loggingEvent.getTimeStamp()); + // In order to avoid NullPointerException, we could push a dummy marker if + // the event's marker is null. However, this would surprise user who + // expect to see a null marker instead of a dummy one. values[i++] = loggingEvent.getMarker(); values[i++] = loggingEvent.getMDCPropertyMap(); - + IThrowableProxy iThrowableProxy = loggingEvent.getThrowableProxy(); - + if (iThrowableProxy != null) { values[i++] = iThrowableProxy; - if(iThrowableProxy instanceof ThrowableProxy) { + if (iThrowableProxy instanceof ThrowableProxy) { values[i++] = ((ThrowableProxy) iThrowableProxy).getThrowable(); } else { values[i++] = null; @@ -138,12 +140,11 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent values[i++] = null; values[i++] = null; } - - - for(int j = 0; j < matcherListSize; j++) { + + for (int j = 0; j < matcherListSize; j++) { values[i++] = (Matcher) matcherList.get(j); } - + return values; } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java index 8be5a62..17eabe8 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java @@ -13,6 +13,7 @@ */ package ch.qos.logback.classic.boolex; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -31,15 +32,22 @@ import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.boolex.EvaluationException; import ch.qos.logback.core.boolex.JaninoEventEvaluatorBase; import ch.qos.logback.core.boolex.Matcher; +import ch.qos.logback.core.filter.EvaluatorFilter; +import ch.qos.logback.core.spi.FilterReply; +import ch.qos.logback.core.util.StatusPrinter; -public class JaninoEventEvaluatorTest { +public class JaninoEventEvaluatorTest { LoggerContext loggerContext = new LoggerContext(); Logger logger = loggerContext.getLogger(ConverterTest.class); Matcher matcherX = new Matcher(); + JaninoEventEvaluator jee = new JaninoEventEvaluator(); + public JaninoEventEvaluatorTest() { + jee.setContext(loggerContext); + matcherX.setName("x"); matcherX.setRegex("^Some\\s.*"); matcherX.start(); @@ -55,33 +63,27 @@ public class JaninoEventEvaluatorTest { @Test public void testBasic() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("message.equals(\"Some message\")"); - jee.setContext(loggerContext); jee.start(); ILoggingEvent event = makeLoggingEvent(null); - //System.out.println(event); + // System.out.println(event); assertTrue(jee.evaluate(event)); } @Test public void testLevel() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("level > DEBUG"); - jee.setContext(loggerContext); jee.start(); ILoggingEvent event = makeLoggingEvent(null); - //System.out.println(event); + // System.out.println(event); assertTrue(jee.evaluate(event)); } @Test public void testtimeStamp() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("timeStamp > 10"); - jee.setContext(loggerContext); jee.start(); ILoggingEvent event = makeLoggingEvent(null); @@ -90,10 +92,7 @@ public class JaninoEventEvaluatorTest { @Test public void testWithMatcher() throws Exception { - - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("x.matches(message)"); - jee.setContext(loggerContext); jee.addMatcher(matcherX); jee.start(); @@ -102,11 +101,8 @@ public class JaninoEventEvaluatorTest { } @Test - public void testMarker() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); + public void marker() throws Exception { jee.setExpression("marker.contains(\"BLUE\")"); - jee.setContext(loggerContext); - jee.addMatcher(matcherX); jee.start(); LoggingEvent event = makeLoggingEvent(null); @@ -115,11 +111,8 @@ public class JaninoEventEvaluatorTest { } @Test - public void testWithNullMarker_LBCORE_118() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); + public void withNullMarker_LBCORE_118() throws Exception { jee.setExpression("marker.contains(\"BLUE\")"); - jee.setContext(loggerContext); - jee.addMatcher(matcherX); jee.start(); ILoggingEvent event = makeLoggingEvent(null); @@ -127,36 +120,32 @@ public class JaninoEventEvaluatorTest { jee.evaluate(event); fail("We should not reach this point"); } catch (EvaluationException ee) { - + // received an exception as expected } } @Test - public void testWithNullMarker() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); + public void evaluatorFilterWithNullMarker_LBCORE_118() throws Exception { + EvaluatorFilter<ILoggingEvent> ef = new EvaluatorFilter<ILoggingEvent>(); + ef.setContext(loggerContext); + + ef.setOnMatch(FilterReply.ACCEPT); + ef.setOnMismatch(FilterReply.DENY); + jee.setExpression("marker.contains(\"BLUE\")"); - jee.setContext(loggerContext); - jee.addMatcher(matcherX); jee.start(); + ef.setEvaluator(jee); + ef.start(); ILoggingEvent event = makeLoggingEvent(null); - try { - jee.evaluate(event); - fail("We should not reach this point"); - } catch (EvaluationException ee) { - - } + assertEquals(FilterReply.NEUTRAL, ef.decide(event)); + } - - @Test public void testComplex() throws Exception { - - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee .setExpression("level >= INFO && x.matches(message) && marker.contains(\"BLUE\")"); - jee.setContext(loggerContext); jee.addMatcher(matcherX); jee.start(); @@ -166,35 +155,23 @@ public class JaninoEventEvaluatorTest { } /** - * check that evaluator with bogis exp does not start + * check that evaluator with bogus exp does not start * * @throws Exception */ @Test public void testBogusExp1() { - - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("mzzzz.get(\"key\").equals(null)"); - jee.setContext(loggerContext); jee.setName("bogus"); jee.start(); assertFalse(jee.isStarted()); - - // StatusPrinter.print(loggerContext); - // LoggingEvent event = makeLoggingEvent(null); - // event.setMarker(MarkerFactory.getMarker("BLUE")); - // - // jee.evaluate(event); } // check that eval stops after errors @Test public void testBogusExp2() { - - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("mdc.get(\"keyXN89\").equals(null)"); - jee.setContext(loggerContext); jee.setName("bogus"); jee.start(); @@ -222,19 +199,17 @@ public class JaninoEventEvaluatorTest { // with 10 parameters 510 nanos (all levels + fields) void loop(JaninoEventEvaluator jee, String msg) throws Exception { ILoggingEvent event = makeLoggingEvent(null); - //final long start = System.nanoTime(); + // final long start = System.nanoTime(); for (int i = 0; i < LEN; i++) { jee.evaluate(event); } - //final long end = System.nanoTime(); - //System.out.println(msg + (end - start) / LEN + " nanos"); + // final long end = System.nanoTime(); + // System.out.println(msg + (end - start) / LEN + " nanos"); } @Test public void testLoop1() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("timeStamp > 10"); - jee.setContext(loggerContext); jee.start(); loop(jee, "timestamp > 10]: "); @@ -242,32 +217,25 @@ public class JaninoEventEvaluatorTest { @Test public void testLoop2() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("x.matches(message)"); - jee.setContext(loggerContext); jee.addMatcher(matcherX); jee.start(); loop(jee, "x.matches(message): "); } - @Test + @Test public void throwable_LBCLASSIC_155_I() throws EvaluationException { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("throwable instanceof java.io.IOException"); - jee.setContext(loggerContext); jee.start(); LoggingEvent event = makeLoggingEvent(new IOException("")); assertTrue(jee.evaluate(event)); } - - @Test + @Test public void throwable_LBCLASSIC_155_II() throws EvaluationException { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("throwableProxy.getClassName().contains(\"IO\")"); - jee.setContext(loggerContext); jee.start(); LoggingEvent event = makeLoggingEvent(new IOException("")); diff --git a/logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml b/logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml index 64d0efb..f2aab92 100644 --- a/logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml +++ b/logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml @@ -9,7 +9,7 @@ <regex>statement [13579]</regex> </matcher> - <expression>message.contains("billing") || odd.matches(formattedMessage)</expression> + <expression>odd.matches(formattedMessage)</expression> </evaluator> <OnMismatch>NEUTRAL</OnMismatch> <OnMatch>DENY</OnMatch> diff --git a/logback-site/src/site/pages/manual/filters.html b/logback-site/src/site/pages/manual/filters.html index 3b61138..b2aa23c 100644 --- a/logback-site/src/site/pages/manual/filters.html +++ b/logback-site/src/site/pages/manual/filters.html @@ -348,7 +348,9 @@ public class SampleFilter extends Filter>ILoggingEvent> { <td>marker</td> <td><code>Marker</code></td> <td>The <code>Marker</code> object associated with the logging - request. + request. Note that marker can be null and it is your + responsibility to check for this condition in order to avoid + <code>NullPointerException</code>. </td> </tr> <tr> @@ -502,7 +504,7 @@ java chapter6.FilterEvents src/main/java/chapter6/basicConfiguration.xml Example 6.: Defining matchers in an event evaluator (logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml) - <pre class="prettyprint source longline"><configuration debug="true"> + <pre class="prettyprint source"><configuration debug="true"> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> @@ -513,7 +515,7 @@ java chapter6.FilterEvents src/main/java/chapter6/basicConfiguration.xml <regex>statement [13579]</regex> </matcher> - <expression>message.contains("billing") || odd.matches(formattedMessage)</expression> + <expression>odd.matches(formattedMessage)</expression> </evaluator> <OnMismatch>NEUTRAL</OnMismatch> <OnMatch>DENY</OnMatch> @@ -533,13 +535,14 @@ java chapter6.FilterEvents src/main/java/chapter6/basicConfiguration.xml we obtain: - 220 [main] INFO chapter6.FilterEvents - logging statement 0 -223 [main] INFO chapter6.FilterEvents - logging statement 2 -223 [main] INFO chapter6.FilterEvents - logging statement 4 -225 [main] INFO chapter6.FilterEvents - logging statement 8 + 260 [main] INFO chapter6.FilterEvents - logging statement 0 +264 [main] INFO chapter6.FilterEvents - logging statement 2 +264 [main] INFO chapter6.FilterEvents - logging statement 4 +266 [main] ERROR chapter6.FilterEvents - billing statement 6 +266 [main] INFO chapter6.FilterEvents - logging statement 8 In case you need to define additional matchers, you can do so by - adding further <code><matcher></code> elements. + adding further <code><matcher></code> elements.   ----------------------------------------------------------------------- Summary of changes: .../classic/boolex/JaninoEventEvaluator.java | 55 ++++++------ .../classic/boolex/JaninoEventEvaluatorTest.java | 94 +++++++------------- .../main/java/chapter6/evaluatorWithMatcher.xml | 2 +- logback-site/src/site/pages/manual/filters.html | 19 +++-- 4 files changed, 71 insertions(+), 99 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-118) EvaluatorFilter returns OnMatch when marker is null
by Manuel Kueblboeck (JIRA) 10 Nov '09

10 Nov '09

EvaluatorFilter returns OnMatch when marker is null --------------------------------------------------- Key: LBCORE-118 URL: http://jira.qos.ch/browse/LBCORE-118 Project: logback-core Issue Type: Bug Components: Other Affects Versions: 0.9.17 Environment: Windows XP Reporter: Manuel Kueblboeck Assignee: Logback dev list Priority: Minor <appender name="Alert" class="ch.qos.logback.core.ConsoleAppender"> <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> <evaluator name="isAlert"> <expression>marker.getName().equals("Alert")</expression> </evaluator> <OnMatch>ACCEPT</OnMatch> <OnMismatch>DENY</OnMismatch> </filter> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>ALERT: %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern> </layout> </appender> In the above example, when an event is logged without an attached marker, the filter returns OnMatch. I would expect that it returns OnMismatch. A work around for this issue is to change the expression to this: <expression>marker != null && marker.getName().equals("Alert")</expression> -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 3

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

10 Nov '09

The branch, master has been updated via baba96b8e2a916ecee6d3fda41c7040535f5b175 (commit) via 0ddd19930833e8f5a2fb71c2b464d0c166783ab6 (commit) from 2f865c2f17e2444e562781b250950d29e3f429f8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=baba96b8e2a916ecee6d3fda… http://github.com/ceki/logback/commit/baba96b8e2a916ecee6d3fda41c7040535f5b… commit baba96b8e2a916ecee6d3fda41c7040535f5b175 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 10 20:39:03 2009 +0100 - applied Hugues Malphettes' second patch as provided in http://jira.qos.ch/browse/LBCLASSIC-165 diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index a69ccb9..f7e1bd7 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -209,8 +209,14 @@ <configuration> <instructions> <Export-Package>ch.qos.logback.classic*, org.slf4j.impl;version=1.5.6</Export-Package> +  + <Import-Package> sun.reflect;resolution:=optional, javax.jms;resolution:=optional, + ch.qos.logback.core.rolling, ch.qos.logback.core.rolling.helper, * </Import-Package> http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=0ddd19930833e8f5a2fb71c2… http://github.com/ceki/logback/commit/0ddd19930833e8f5a2fb71c2b464d0c166783… commit 0ddd19930833e8f5a2fb71c2b464d0c166783ab6 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 10 19:44:52 2009 +0100 - short mention of licensing change diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 5792c7e..0254ae2 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -30,6 +30,12 @@ <h3>13th of November 2009 - Release of version 0.9.18</h3> + After a very long investigation resulting in somewhat a better + understanding of licensing issues, logback is now <a + href="license.html">dual-licensed</a> under the EPL 1.0 and LGPL + 2.1. + + Fixed Private-Package and Export-Package sections in logback-classic.jar MANIFEST as reported in <a href="http://jira.qos.ch/browse/LBCLASSIC-165">LBCLASSIC-165</a> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 6 ++++++ logback-site/src/site/pages/news.html | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-155) ThrowableProxy passed into EventEvaluator
by Hontvári József (JIRA) 10 Nov '09

10 Nov '09

ThrowableProxy passed into EventEvaluator ----------------------------------------- Key: LBCLASSIC-155 URL: http://jira.qos.ch/browse/LBCLASSIC-155 Project: logback-classic Issue Type: Bug Components: Other Affects Versions: 0.917 Reporter: Hontvári József Assignee: Logback dev list In an event evaluator which is called in the option part of an "ex" formatting specifier I cannot use a "throwable instanceof example" expression, because the evaluator receives a ThrowableProxy and not a Throwable. Here is a stack trace, dumped from the evaluator expression. It does include a ThrowableProxyConverter.convert call: java.lang.Exception: Stack trace at java.lang.Thread.dumpStack(Thread.java:1206) at mireka.E.f(E.java:21) at SC.eval0(SC.java:3) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.codehaus.janino.ScriptEvaluator.evaluate(ScriptEvaluator.java) at org.codehaus.janino.ScriptEvaluator.evaluate(ScriptEvaluator.java) at ch.qos.logback.core.boolex.JaninoEventEvaluatorBase.evaluat (JaninoEventEvaluatorBase.java:53) at ch.qos.logback.classic.pattern.ThrowableProxyConverter.convert(ThrowableProxyConverter.java:109) at ch.qos.logback.classic.pattern.ThrowableProxyConverter.convert(ThrowableProxyConverter.java:31) at ch.qos.logback.core.pattern.FormattingConverter.write(FormattingConverter.java:32) at ch.qos.logback.core.pattern.PatternLayoutBase.writeLoopOnConverters(PatternLayoutBase.java:110) at ch.qos.logback.classic.PatternLayout.doLayout(PatternLayout.java:132) at ch.qos.logback.classic.PatternLayout.doLayout(PatternLayout.java:51) at ch.qos.logback.core.WriterAppender.subAppend(WriterAppender.java:267) at ch.qos.logback.core.WriterAppender.append(WriterAppender.java:117) at ch.qos.logback.core.UnsynchronizedAppenderBase.doAppend(UnsynchronizedAppenderBase.java:89) at ch.qos.logback.core.spi.AppenderAttachableImpl.appendLoopOnAppenders(AppenderAttachableImpl.java:60) at ch.qos.logback.classic.Logger.appendLoopOnAppenders(Logger.java:271) at ch.qos.logback.classic.Logger.callAppenders(Logger.java:258) at ch.qos.logback.classic.Logger.buildLoggingEventAndAppend(Logger.java:440) at ch.qos.logback.classic.Logger.filterAndLog_0_Or3Plus(Logger.java:394) at ch.qos.logback.classic.Logger.debug(Logger.java:517) at org.subethamail.smtp.server.Session.run(Session.java:119) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 1

branch, master, updated. 2f865c2f17e2444e562781b250950d29e3f429f8
by git-noreply＠pixie.qos.ch 10 Nov '09

10 Nov '09

The branch, master has been updated via 2f865c2f17e2444e562781b250950d29e3f429f8 (commit) from d6158815139bdc475619c07ce2a1e21185942343 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=2f865c2f17e2444e562781b2… http://github.com/ceki/logback/commit/2f865c2f17e2444e562781b250950d29e3f42… commit 2f865c2f17e2444e562781b250950d29e3f429f8 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 10 18:44:10 2009 +0100 minor edit diff --git a/logback-site/src/site/pages/manual/filters.html b/logback-site/src/site/pages/manual/filters.html index 7ab56f7..3b61138 100644 --- a/logback-site/src/site/pages/manual/filters.html +++ b/logback-site/src/site/pages/manual/filters.html @@ -488,16 +488,15 @@ java chapter6.FilterEvents src/main/java/chapter6/basicConfiguration.xml <h2><a name="matcher" href="#matcher">Matchers</a></h2> - While it is possible to do pattern matching operations by - invoking the <a + While it is possible to do pattern matching by invoking the <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/String.html#matches%28jav…">matches()</a> method in the <code>String</code> class, this incurs the cost of - the creation by compilation of a new Pattern object each time the + compiling of a brand new <code>Pattern</code> object each time the filter is invoked. To eliminate this overhead, you can predefine one or more <a href="../xref/ch/qos/logback/core/boolex/Matcher.html">Matcher</a> - objects. Once a matcher is defined, it can be repeatedly referenced - by name in the evaluator expression. + objects. Once a matcher is defined, it can be repeatedly + referenced by name in the evaluator expression. An example should clarify the point: @@ -539,6 +538,13 @@ java chapter6.FilterEvents src/main/java/chapter6/basicConfiguration.xml 223 [main] INFO chapter6.FilterEvents - logging statement 4 225 [main] INFO chapter6.FilterEvents - logging statement 8 + In case you need to define additional matchers, you can do so by + adding further <code><matcher></code> elements. + +  +  +  + <h2><a name="TurboFilter" href="#TurboFilter">TurboFilters</a></h2> <code>TurboFilter</code> objects all extend the ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/manual/filters.html | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

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

10 Nov '09

The branch, master has been updated via d6158815139bdc475619c07ce2a1e21185942343 (commit) from 40c50961a8e1685a2d7dc1bad65eea2361b5c740 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=d6158815139bdc475619c07c… http://github.com/ceki/logback/commit/d6158815139bdc475619c07ce2a1e21185942… commit d6158815139bdc475619c07ce2a1e21185942343 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 10 17:07:36 2009 +0100 - ongoing editing of filters.html - fixed http://jira.qos.ch/browse/LBCLASSIC-155 diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java index 093cc8e..232c689 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java @@ -23,6 +23,7 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.IThrowableProxy; import ch.qos.logback.classic.spi.LoggerContextVO; +import ch.qos.logback.classic.spi.ThrowableProxy; import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.boolex.JaninoEventEvaluatorBase; import ch.qos.logback.core.boolex.Matcher; @@ -45,12 +46,15 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent DEFAULT_PARAM_NAME_LIST.add("event"); DEFAULT_PARAM_NAME_LIST.add("message"); + + DEFAULT_PARAM_NAME_LIST.add("formattedMessage"); DEFAULT_PARAM_NAME_LIST.add("logger"); DEFAULT_PARAM_NAME_LIST.add("loggerContext"); DEFAULT_PARAM_NAME_LIST.add("level"); DEFAULT_PARAM_NAME_LIST.add("timeStamp"); DEFAULT_PARAM_NAME_LIST.add("marker"); DEFAULT_PARAM_NAME_LIST.add("mdc"); + DEFAULT_PARAM_NAME_LIST.add("throwableProxy"); DEFAULT_PARAM_NAME_LIST.add("throwable"); DEFAULT_PARAM_TYPE_LIST.add(int.class); @@ -61,12 +65,14 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent DEFAULT_PARAM_TYPE_LIST.add(ILoggingEvent.class); DEFAULT_PARAM_TYPE_LIST.add(String.class); DEFAULT_PARAM_TYPE_LIST.add(String.class); + DEFAULT_PARAM_TYPE_LIST.add(String.class); DEFAULT_PARAM_TYPE_LIST.add(LoggerContextVO.class); DEFAULT_PARAM_TYPE_LIST.add(int.class); DEFAULT_PARAM_TYPE_LIST.add(long.class); DEFAULT_PARAM_TYPE_LIST.add(Marker.class); DEFAULT_PARAM_TYPE_LIST.add(Map.class); DEFAULT_PARAM_TYPE_LIST.add(IThrowableProxy.class); + DEFAULT_PARAM_TYPE_LIST.add(Throwable.class); } @@ -111,18 +117,29 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent values[i++] = loggingEvent; values[i++] = loggingEvent.getMessage(); + values[i++] = loggingEvent.getFormattedMessage(); values[i++] = loggingEvent.getLoggerName(); values[i++] = loggingEvent.getLoggerContextVO(); values[i++] = loggingEvent.getLevel().toInteger(); values[i++] = new Long(loggingEvent.getTimeStamp()); values[i++] = loggingEvent.getMarker(); values[i++] = loggingEvent.getMDCPropertyMap(); - if (loggingEvent.getThrowableProxy() != null) { - values[i++] = loggingEvent.getThrowableProxy(); + + IThrowableProxy iThrowableProxy = loggingEvent.getThrowableProxy(); + + if (iThrowableProxy != null) { + values[i++] = iThrowableProxy; + if(iThrowableProxy instanceof ThrowableProxy) { + values[i++] = ((ThrowableProxy) iThrowableProxy).getThrowable(); + } else { + values[i++] = null; + } } else { values[i++] = null; + values[i++] = null; } + for(int j = 0; j < matcherListSize; j++) { values[i++] = (Matcher) matcherList.get(j); } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/EvaluatorAction.java b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/EvaluatorAction.java index 3d2c890..3880d08 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/EvaluatorAction.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/EvaluatorAction.java @@ -16,11 +16,8 @@ package ch.qos.logback.classic.joran.action; import ch.qos.logback.classic.boolex.JaninoEventEvaluator; import ch.qos.logback.core.joran.action.AbstractEventEvaluatorAction; - public class EvaluatorAction extends AbstractEventEvaluatorAction { - - protected String defaultClassName() { + protected String defaultClassName() { return JaninoEventEvaluator.class.getName(); } - } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextVO.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextVO.java index b7768d8..e6cbe18 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextVO.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextVO.java @@ -20,13 +20,14 @@ import ch.qos.logback.classic.LoggerContext; /** * LoggerContextVO offers a restricted view of LoggerContext intended to be - * exposed by LoggingEvent to remote system. This restricted view is optimized + * exposed by LoggingEvent to remote systems. This restricted view is optimized * for serialization. * - * Some of the LoggerContext or Logger attributes should not survive + * + * Some of the LoggerContext or Logger attributes MUST not survive * serialization, e.g appenders, level values etc, as these attributes may have - * other values on the remote platform. LoggerContextVO class exposes - * the minimal (relevant) attributes to remote host, instead of having to deal + * other values on the remote platform. LoggerContextVO class exposes the + * minimal and relevant attributes to the remote host, instead of having to deal * with an incomplete LoggerContext with many null references. * * @author Ceki Gülcü diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java index 13e8ecf..8be5a62 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java @@ -17,6 +17,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.io.IOException; + import org.junit.Test; import org.slf4j.MarkerFactory; @@ -249,4 +251,27 @@ public class JaninoEventEvaluatorTest { loop(jee, "x.matches(message): "); } + @Test + public void throwable_LBCLASSIC_155_I() throws EvaluationException { + JaninoEventEvaluator jee = new JaninoEventEvaluator(); + jee.setExpression("throwable instanceof java.io.IOException"); + jee.setContext(loggerContext); + jee.start(); + + LoggingEvent event = makeLoggingEvent(new IOException("")); + assertTrue(jee.evaluate(event)); + } + + + @Test + public void throwable_LBCLASSIC_155_II() throws EvaluationException { + JaninoEventEvaluator jee = new JaninoEventEvaluator(); + jee.setExpression("throwableProxy.getClassName().contains(\"IO\")"); + jee.setContext(loggerContext); + jee.start(); + + LoggingEvent event = makeLoggingEvent(new IOException("")); + assertTrue(jee.evaluate(event)); + } + } diff --git a/logback-core/src/main/java/ch/qos/logback/core/boolex/EventEvaluatorBase.java b/logback-core/src/main/java/ch/qos/logback/core/boolex/EventEvaluatorBase.java index 69c60a5..6b758cc 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/boolex/EventEvaluatorBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/boolex/EventEvaluatorBase.java @@ -39,7 +39,6 @@ abstract public class EventEvaluatorBase<E> extends ContextAwareBase implements public void start() { started = true; - } public void stop() { diff --git a/logback-examples/src/main/java/chapter6/basicEventEvaluator.xml b/logback-examples/src/main/java/chapter6/basicEventEvaluator.xml index 16ceb8a..f6a1e3e 100644 --- a/logback-examples/src/main/java/chapter6/basicEventEvaluator.xml +++ b/logback-examples/src/main/java/chapter6/basicEventEvaluator.xml @@ -2,7 +2,7 @@ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> - <evaluator name="myEval"> + <evaluator> <expression>message.contains("billing")</expression> </evaluator> <OnMismatch>NEUTRAL</OnMismatch> diff --git a/logback-examples/src/main/java/chapter6/basicEventEvaluator.xml b/logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml similarity index 62% copy from logback-examples/src/main/java/chapter6/basicEventEvaluator.xml copy to logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml index 16ceb8a..64d0efb 100644 --- a/logback-examples/src/main/java/chapter6/basicEventEvaluator.xml +++ b/logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml @@ -2,8 +2,14 @@ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> - <evaluator name="myEval"> - <expression>message.contains("billing")</expression> + <evaluator> + + <matcher> + <Name>odd</Name> + <regex>statement [13579]</regex> + </matcher> + + <expression>message.contains("billing") || odd.matches(formattedMessage)</expression> </evaluator> <OnMismatch>NEUTRAL</OnMismatch> <OnMatch>DENY</OnMatch> diff --git a/logback-site/src/site/pages/manual/filters.html b/logback-site/src/site/pages/manual/filters.html index 871ef11..7ab56f7 100644 --- a/logback-site/src/site/pages/manual/filters.html +++ b/logback-site/src/site/pages/manual/filters.html @@ -105,7 +105,7 @@ events, the value NEUTRAL is returned. -Example 6.1: Basic custom filter (<a href="../xref/chapter6/SampleFilter.html">logback-examples/src/main/java/chapter6/SampleFilter.java</a>) +Example 6.: Basic custom filter (<a href="../xref/chapter6/SampleFilter.html">logback-examples/src/main/java/chapter6/SampleFilter.java</a>) <pre class="prettyprint source">package chapter6; import ch.qos.logback.classic.spi.ILoggingEvent; @@ -128,7 +128,7 @@ public class SampleFilter extends Filter>ILoggingEvent> { <code>SampleFilter</code> to a <code>ConsoleAppener</code>. -Example 6.2: SampleFilter configuration (logback-examples/src/main/java/chapter6/SampleFilterConfig.xml) +Example 6.: SampleFilter configuration (logback-examples/src/main/java/chapter6/SampleFilterConfig.xml) <pre class="prettyprint source"><configuration> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> @@ -183,7 +183,7 @@ public class SampleFilter extends Filter>ILoggingEvent> { configuration file. -Example 6.3: Sample LevelFilter configuration (logback-examples/src/main/java/chapter6/levelFilterConfig.xml) +Example 6.: Sample LevelFilter configuration (logback-examples/src/main/java/chapter6/levelFilterConfig.xml) <pre class="prettyprint source"><configuration> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> @@ -215,7 +215,7 @@ public class SampleFilter extends Filter>ILoggingEvent> { configuration file. -Example 6.4: Sample ThresholdFilter configuration (logback-examples/src/main/java/chapter6/thresholdFilterConfig.xml) +Example 6.: Sample ThresholdFilter configuration (logback-examples/src/main/java/chapter6/thresholdFilterConfig.xml) <pre class="prettyprint source"><configuration> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> @@ -249,28 +249,29 @@ public class SampleFilter extends Filter>ILoggingEvent> { class="option">OnMismatch properties. - The <code>EventEvaluator</code> class is abstract and you can - implement your own even evaluation logic. Logback-classic ships + The <code>EventEvaluator</code> is an abstract class and you + can implement your own event evaluation logic by sub-classing + <code>EventEvaluator</code>. However, logback-classic also ships with a concrete evaluator implementation called <a href="../xref/ch/qos/logback/classic/boolex/JaninoEventEvaluator.html">JaninoEventEvaluator</a> - which takes artibtrary boolean expressions (in the Java language) - as the evaluation criispteria. We refer to such artbitrary boolean - expressions in the Java language as "evaulation - expressions". Evaluation expressions enable hereto - unprecedented flexibility in event filtering. + which takes artibtrary java language boolean expressions as the + evaluation criteria. We refer to such java language boolean + expressions as "evaulation expressions". Evaluation + expressions enable hereto unprecedented flexibility in event + filtering. Evaluation expressions are compiled on-the-fly during the interpretation of the configuration file. As a user, you do not need to worry about the actual plumbing. However, it is your - reponsibility to ensure that the expression is boolean, that it - evaluates to true or false. + reponsibility to ensure that the java-language expression is + boolean, that it evaluates to true or false. Given that an evaluation expression acts on the current logging - event, logback implicitly exposes various fields of the logging + event, logback automatically exports various fields of the logging event as variables accessible from the evaluation expression. The - list of these implicit variables is given below. + case-sensitive names these variables is listed below. <table class="bodyTable"> @@ -294,19 +295,37 @@ public class SampleFilter extends Filter>ILoggingEvent> { <tr class="alt"> <td>message</td> <td><code>String</code></td> - <td>The message of the logging request.</td> + <td>The raw message of the logging request. For some logger + l, when you write l.info("Hello {}", name); where + name is assigned the value "Alice", then "Hello {}" is the + message.</td> </tr> + + <tr> + <td>formatedMessage</td> + <td><code>String</code></td> + <td>The formatted message in the logging request. For some + logger l, when you write l.info("Hello {}", name); + where name is assigned the value "Alice", then "Hello Alice" + is the formatted message.</td> </tr> - <tr> + + <tr class="alt"> <td>logger</td> - <td><code>LoggerRemoteView</code></td> - <td>This object is a proxy for the logger object where the - logging request was issued. It can be viewed as a regular - logger object. However, it has some nice performance - properties, especially with respect to serialization. + <td><code>String</code></td> + <td>The name of the logger. + </td> + </tr> + + <tr> + <td>loggerContext</td> + <td><a + href="../xref/ch/qos/logback/classic/spi/LoggerContextVO.html"><code>LoggerContextVO</code></a></td> + <td>A restricted (value object) view of the logger context to which the logging event belongs to. </td> </tr> - <tr class="alt"> + + <tr class="alt"> <td>level</td> <td><code>int</code></td> <td>The int value corresponding to the level. To help create @@ -316,6 +335,7 @@ public class SampleFilter extends Filter>ILoggingEvent> { INFO is a correct expression. </td> </tr> + <tr> <td>timeStamp </td> @@ -324,7 +344,7 @@ public class SampleFilter extends Filter>ILoggingEvent> { creation. </td> </tr> - <tr class="alt"> + <tr class="alt"> <td>marker</td> <td><code>Marker</code></td> <td>The <code>Marker</code> object associated with the logging @@ -332,39 +352,53 @@ public class SampleFilter extends Filter>ILoggingEvent> { </td> </tr> <tr> - <td>mdc - </td> + <td>mdc</td> <td><code>Map</code></td> <td>A map containing all the MDC values at the time of the creation of the logging event. A value can be accessed by using the following expression: mdc.get("myKey"). </td> </tr> - <tr class="alt"> + + <tr class="alt"> <td>throwable</td> - <td><code>Throwable</code></td> - <td>The exception associated with the logging event + <td>java.lang.Throwable</td> + <td>If no exception is associated with the event, then the + value of the "throwable" variable will be null. Unfortunately, + "throwable" does not survive serialization. Thus, on remote + systems, its value will always be null. For location + independent expresisons, use the <code>throwableProxy</code> + variable described next. + </td> + </tr> + + <tr> + <td>throwableProxy</td> + <td><a + href="../xref/ch/qos/logback/classic/spi/IThrowableProxy.html"><code>IThrowableProxy</code></a></td> + <td>A proxy for the exception associated with the logging + event. If no exception is associated with the event, then the + value of the "throwableProxy" variable will be null. In + contrast to "throwable", when an exception is associated with + an event, the value of "throwableProxy" will be non-null even + on remote systems, that is even after serialization. </td> </tr> - </table> - - The behaviour of the <code>EvaluatorFilter</code> is also - affected by its OnMatch and OnMismatch options taking values of type - <code>FilterReply</code>, i.e. DENY, ACCEPT, NEUTRAL. - + + </table> + Here is a concrete example. -Example 6.5: Basic event evaluator usage (logback-examples/src/main/java/chapter6/basicEventEvaluator.xml) +Example 6.: Basic event evaluator usage (logback-examples/src/main/java/chapter6/basicEventEvaluator.xml) -<pre class="prettyprint source"><configuration> +<pre class="prettyprint source longline"><configuration> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> - <evaluator name="myEval"> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <evaluator>  <expression>message.contains("billing")</expression> </evaluator> <OnMismatch>NEUTRAL</OnMismatch> @@ -382,18 +416,29 @@ public class SampleFilter extends Filter>ILoggingEvent> { </root> </configuration></pre> - The bold part in the previous configuration adds an + The bold part in the above configuration file adds an <code>EvaluatorFilter</code> to a <code>ConsoleAppender</code>. An - <code>EventEvaluator</code> is then injected into the - <code>EvaluatorFilter</code>. The expression element - corresponds to the evaluation expression described previously. The - expression <code>message.contains("billing")</code> returns a - boolean value. Notice that the message variable is - defined implicitly. + evaluator of type <code>JaninoEventEvaluator</code> is then + injected into the <code>EvaluatorFilter</code>. In the absence of + class attribute in the + <code><evaluator></code> element specified by the user, joran + will infer a default type, i.e. <code>JaninoEventEvaluator</code>, + for the evaluator. This is one of the <a + href="onJoran.html#defaultClassMapping">few occurrences</a> where + Joran implicitly infers the type of a component. + + + The expression element corresponds to the evaluation + expression just discussed. The expression + <code>message.contains("billing")</code> returns a boolean + value. Notice that the message variable is exported + automatically by <code>JaninoEventEvaluator</code>. - This evalutor filter will drop all logging events whose message - contains the string "billing". + Given that the OnMatch property is + set to NEUTRAL and the OnMismatch + property set to DENY, this evalutor filter will drop all logging + events whose message contains the string "billing". The <a @@ -421,11 +466,12 @@ java chapter6.FilterEvents src/main/java/chapter6/basicConfiguration.xml - Suppose that we want to get rid of the billing information. - The basicEventEvaluator.xml configuration file just - described, does exactly what we want. + Suppose that we want to get rid of the "billing statement". + The basicEventEvaluator.xml configuration file listed + above filters messages containing the string "billing" which is + precisely the desired outcome. - Running with filters: + Running with basicEventEvaluator.xml: java chapter6.FilterEvents src/main/java/chapter6/basicEventEvaluator.xml we obtain: @@ -440,7 +486,59 @@ java chapter6.FilterEvents src/main/java/chapter6/basicConfiguration.xml 0 [main] INFO chapter6.FilterEvents - logging statement 8 0 [main] INFO chapter6.FilterEvents - logging statement 9 + <h2><a name="matcher" href="#matcher">Matchers</a></h2> + + While it is possible to do pattern matching operations by + invoking the <a + href="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/String.html#matches%28jav…">matches()</a> + method in the <code>String</code> class, this incurs the cost of + the creation by compilation of a new Pattern object each time the + filter is invoked. To eliminate this overhead, you can predefine + one or more <a + href="../xref/ch/qos/logback/core/boolex/Matcher.html">Matcher</a> + objects. Once a matcher is defined, it can be repeatedly referenced + by name in the evaluator expression. + + An example should clarify the point: + +Example 6.: Defining matchers in an event evaluator (logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml) + + <pre class="prettyprint source longline"><configuration debug="true"> + + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <evaluator> + <matcher> + <Name>odd</Name> +  + <regex>statement [13579]</regex> + </matcher> + + <expression>message.contains("billing") || odd.matches(formattedMessage)</expression> + </evaluator> + <OnMismatch>NEUTRAL</OnMismatch> + <OnMatch>DENY</OnMatch> + </filter> + <layout> + <pattern>%-4relative [%thread] %-5level %logger - %msg%n</pattern> + </layout> + </appender> + + <root level="DEBUG"> + <appender-ref ref="STDOUT" /> + </root> +</configuration></pre> + + Running with evaluatorWithMatcher.xml: + java chapter6.FilterEvents src/main/java/chapter6/evaluatorWithMatcher.xml + we obtain: + + 220 [main] INFO chapter6.FilterEvents - logging statement 0 +223 [main] INFO chapter6.FilterEvents - logging statement 2 +223 [main] INFO chapter6.FilterEvents - logging statement 4 +225 [main] INFO chapter6.FilterEvents - logging statement 8 + <h2><a name="TurboFilter" href="#TurboFilter">TurboFilters</a></h2> <code>TurboFilter</code> objects all extend the @@ -480,7 +578,7 @@ java chapter6.FilterEvents src/main/java/chapter6/basicConfiguration.xml slightly more complex filter: -Example 6.6: Basic custom <code>TurboFilter</code> (<a href="../xref/chapter6/SampleTurboFilter.html">logback-examples/src/main/java/chapter6/SampleTurboFilter.java</a>) +Example 6.: Basic custom <code>TurboFilter</code> (<a href="../xref/chapter6/SampleTurboFilter.html">logback-examples/src/main/java/chapter6/SampleTurboFilter.java</a>) <pre class="prettyprint source">package chapter6; import org.slf4j.Marker; @@ -545,7 +643,7 @@ public class SampleTurboFilter extends TurboFilter { created <code>TurboFilter</code>. -Example 6.7: Basic custom <code>TurboFilter</code> configuration (logback-examples/src/main/java/chapter6/sampleTurboFilterConfig.xml) +Example 6.: Basic custom <code>TurboFilter</code> configuration (logback-examples/src/main/java/chapter6/sampleTurboFilterConfig.xml) <pre class="prettyprint source"><configuration> <turboFilter class="chapter6.SampleTurboFilter"> <Marker>sample</Marker> @@ -581,7 +679,7 @@ public class SampleTurboFilter extends TurboFilter { <code>MDCFilter</code> and <code>MarkerFilter</code>. -Example 6.8: <code>MDCFilter</code> and <code>MarkerFilter</code> +Example 6.: <code>MDCFilter</code> and <code>MarkerFilter</code> configuration (logback-examples/src/main/java/chapter6/turboFilters.xml) <pre class="prettyprint source"><configuration> @@ -708,7 +806,7 @@ logger.debug("Hello {}.", name1);</pre> -Example: <code>DuplicateMessageFilter</code> +Example 6.: <code>DuplicateMessageFilter</code> configuration (logback-examples/src/main/java/chapter6/duplicateMessage.xml) <pre class="prettyprint source"><configuration> @@ -783,7 +881,7 @@ configuration (logback-examples/src/main/java/chapter6/duplicateMessage.xml) -Example 6.9: Access Evaluator (logback-examples/src/main/java/chapter6/accessEventEvaluator.xml) +Example 6.: Access Evaluator (logback-examples/src/main/java/chapter6/accessEventEvaluator.xml) <pre class="prettyprint source"><configuration> <appender name="STDOUT" diff --git a/logback-site/src/site/pages/manual/onJoran.html b/logback-site/src/site/pages/manual/onJoran.html index edabe34..ba08ea4 100644 --- a/logback-site/src/site/pages/manual/onJoran.html +++ b/logback-site/src/site/pages/manual/onJoran.html @@ -613,9 +613,12 @@ Element [abc] asked to be printed. </li> </ol> - In logback-classic, there are just two rules mapping (parent - class/property name) couples to a default class. These are listed in - the table below. + <h4><a name="defaultClassMapping" + href="#defaultClassMapping">Default class mapping</a></h4> + + In logback-classic, there are a handful of inernal rules mapping + parent class/property name couples to a default class. These are + listed in the table below. <table class="bodyTable"> <tr> @@ -623,12 +626,20 @@ Element [abc] asked to be printed. <th>property name </th> <th>default nested class</th> </tr> + <tr > <td>ch.qos.logback.core.AppenderBase</td> <td>layout</td> <td>ch.qos.logback.classic.PatternLayout</td> </tr> + <tr class="alt"> + <td>ch.qos.logback.core.UnsynchronizedAppenderBase</td> + <td>layout</td> + <td>ch.qos.logback.classic.PatternLayout</td> + </tr> + + <tr> <td>ch.qos.logback.core.filter.EvaluatorFilter</td> <td>evaluator</td> <td>ch.qos.logback.classic.boolex.JaninoEventEvaluator</td> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 2efe00d..5792c7e 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -36,6 +36,14 @@ by applying the relavant patch supplied by Hugues Malphettes. + JaninoEventEvaluator now passes the throwable associated with + an event as a <code>java.lang.Throwable</code> instead of an + <code>IThrowableProxy</code>. This fixes <a + href="http://jira.qos.ch/browse/LBCLASSIC-155">LBCLASSIC-155</a> + as reported by Hontvári József. See <a + href="manual/filters.html#evalutatorFilter">EvaluatorFilter + documentation</a> for more details. + <hr width="80%" align="center" /> <h3>9th of August 2009 - Release of version 0.9.17</h3> ----------------------------------------------------------------------- Summary of changes: .../classic/boolex/JaninoEventEvaluator.java | 21 ++- .../classic/joran/action/EvaluatorAction.java | 5 +- .../qos/logback/classic/spi/LoggerContextVO.java | 9 +- .../classic/boolex/JaninoEventEvaluatorTest.java | 25 +++ .../logback/core/boolex/EventEvaluatorBase.java | 1 - .../src/main/java/chapter6/basicEventEvaluator.xml | 2 +- ...EventEvaluator.xml => evaluatorWithMatcher.xml} | 10 +- logback-site/src/site/pages/manual/filters.html | 214 ++++++++++++++------ logback-site/src/site/pages/manual/onJoran.html | 17 ++- logback-site/src/site/pages/news.html | 8 + 10 files changed, 237 insertions(+), 75 deletions(-) copy logback-examples/src/main/java/chapter6/{basicEventEvaluator.xml => evaluatorWithMatcher.xml} (62%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0