- logback-dev - mailman3.qos.ch

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.30-10-ga442a17
by git-noreply＠pixie.qos.ch 28 Sep '11

28 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via a442a1734057dc241273ad244695f20a67483aea (commit) via eef137b0c6ca92cd4f4ca3e5bb3387bb2d5a42df (commit) via ca14a1c2bd8d7c248ec60d24b4122ee07e2dbc3d (commit) via 379c40573e208b2c5bf52c7ed25dc7e55f52eb80 (commit) via 516d7f5faca20df0de597916b7929eefa5ee053a (commit) from ce19ada3e6bb9aafbc8eccae93898e04de29e8ee (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=a442a1734057dc241273ad24… http://github.com/ceki/logback/commit/a442a1734057dc241273ad244695f20a67483… commit a442a1734057dc241273ad244695f20a67483aea Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Sep 28 22:26:40 2011 +0200 - Merge changes from lbcore224 branch. Essentially AppenderAttachableImpl now uses CopyOnWriteArrayList instead of ReadWriteLock. diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/WithZookeperTest._ava b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/WithZookeperTest._ava new file mode 100644 index 0000000..72e99e9 --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/WithZookeperTest._ava @@ -0,0 +1,53 @@ +package ch.qos.logback.classic.issue.lbcore224; + +import org.apache.zookeeper.test.QuorumUtil; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + + + +// This test requires zookeeper 3.4.0 built from SVN trunk and setting +// "build.test.dir" system property + +// recommended logback-test.xml file contents for this test: +<configuration> + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <file>lbcore224.log</file> + <encoder> + <pattern>%logger{35} - %msg%n</pattern> + </encoder> + </appender> + + <root> + <level value="INFO" /> + <appender-ref ref="FILE" /> + </root> +</configuration> + + +public class WithZookeperTest { + static final String BUILT_TEST_DIR_PROP_KEY = "build.test.dir"; + QuorumUtil qU; + + @Before + public void before() { + System.setProperty(BUILT_TEST_DIR_PROP_KEY, "/tmp/zoo"); + qU = new QuorumUtil(1); + } + + @After + public void after() throws Exception { + qU.tearDown(); + System.clearProperty(BUILT_TEST_DIR_PROP_KEY); + } + + @Test + public void shouldNotThrowIllegalMonitorStateException () throws Exception { + for (int i = 0; i < 10; i++) { + qU.startQuorum(); + qU.shutdownAll(); + System.out.println("iteration "+i); + } + } +} diff --git a/logback-classic/src/test/resources/logback-test.xml b/logback-classic/src/test/resources/logback-test.xml deleted file mode 100644 index 2c54715..0000000 --- a/logback-classic/src/test/resources/logback-test.xml +++ /dev/null @@ -1,17 +0,0 @@ -<configuration> - - - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>lbcore224.log</file> - <encoder> - <pattern>%logger{35} - %msg%n</pattern> - </encoder> - </appender> - - - - <root> - <level value="INFO" /> - <appender-ref ref="FILE" /> - </root> -</configuration> \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 20 +++ .../issue/lbclassic135/LoggingRunnable.java | 21 ++- .../logback/classic/issue/lbcore224/Reduce.java | 160 ++++++++++++++++++++ .../classic/issue/lbcore224/WithZookeperTest._ava | 53 +++++++ .../classic/issue/lbcore224/WithZookeperTest.java | 37 +++++ .../logback/core/spi/AppenderAttachableImpl.java | 104 ++++--------- .../logback/core/rolling/RollingScaffolding.scala | 1 - 7 files changed, 318 insertions(+), 78 deletions(-) create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/Reduce.java create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/WithZookeperTest._ava create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/WithZookeperTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, lbcore224, updated. v_0.9.30-9-geef137b
by git-noreply＠pixie.qos.ch 28 Sep '11

28 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, lbcore224 has been updated via eef137b0c6ca92cd4f4ca3e5bb3387bb2d5a42df (commit) from ca14a1c2bd8d7c248ec60d24b4122ee07e2dbc3d (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 20 ++++ .../issue/lbclassic135/LoggingRunnable.java | 21 +++- .../classic/issue/lbcore224/LBCORE224Test.java | 30 ------ .../classic/issue/lbcore224/WithZookeperTest.java | 37 +++++++ .../logback/core/spi/AppenderAttachableImpl.java | 108 +++++--------------- .../logback/core/rolling/RollingScaffolding.scala | 1 - 6 files changed, 99 insertions(+), 118 deletions(-) delete mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/LBCORE224Test.java create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/WithZookeperTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, lbcore224, updated. v_0.9.30-8-gca14a1c
by git-noreply＠pixie.qos.ch 27 Sep '11

27 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, lbcore224 has been updated via ca14a1c2bd8d7c248ec60d24b4122ee07e2dbc3d (commit) from 379c40573e208b2c5bf52c7ed25dc7e55f52eb80 (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=ca14a1c2bd8d7c248ec60d24… http://github.com/ceki/logback/commit/ca14a1c2bd8d7c248ec60d24b4122ee07e2db… commit ca14a1c2bd8d7c248ec60d24b4122ee07e2dbc3d Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Sep 27 16:01:46 2011 +0200 remove unused import diff --git a/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java b/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java index ecb03ae..0eaf854 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java +++ b/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java @@ -21,7 +21,6 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import ch.qos.logback.core.Appender; -import ch.qos.logback.core.joran.event.StartEvent; /** * A ReentrantReadWriteLock based implementation of the ----------------------------------------------------------------------- Summary of changes: .../logback/core/spi/AppenderAttachableImpl.java | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, lbcore224, updated. v_0.9.30-7-g379c405
by git-noreply＠pixie.qos.ch 27 Sep '11

27 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, lbcore224 has been updated via 379c40573e208b2c5bf52c7ed25dc7e55f52eb80 (commit) from 516d7f5faca20df0de597916b7929eefa5ee053a (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=379c40573e208b2c5bf52c7e… http://github.com/ceki/logback/commit/379c40573e208b2c5bf52c7ed25dc7e55f52e… commit 379c40573e208b2c5bf52c7ed25dc7e55f52eb80 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Sep 27 16:00:11 2011 +0200 output lock/unlocks operations on the console diff --git a/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java b/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java index 17fb681..ecb03ae 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java +++ b/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java @@ -21,6 +21,7 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import ch.qos.logback.core.Appender; +import ch.qos.logback.core.joran.event.StartEvent; /** * A ReentrantReadWriteLock based implementation of the @@ -40,6 +41,7 @@ public class AppenderAttachableImpl<E> implements AppenderAttachable<E> { * added again. */ public void addAppender(Appender<E> newAppender) { + p("addAppender(Appender)"); if (newAppender == null) { throw new IllegalArgumentException("Null argument disallowed"); } @@ -58,6 +60,7 @@ public class AppenderAttachableImpl<E> implements AppenderAttachable<E> { */ public int appendLoopOnAppenders(E e) { int size = 0; + p(" LOCK"); r.lock(); try { for (Appender<E> appender : appenderList) { @@ -65,6 +68,7 @@ public class AppenderAttachableImpl<E> implements AppenderAttachable<E> { size++; } } finally { + p(" UNLOCK"); r.unlock(); } return size; @@ -77,6 +81,7 @@ public class AppenderAttachableImpl<E> implements AppenderAttachable<E> { * @return Iterator An iterator of attached appenders. */ public Iterator<Appender<E>> iteratorForAppenders() { + if(1==1) throw new IllegalStateException(""); List<Appender<E>> copy; r.lock(); try { @@ -95,6 +100,7 @@ public class AppenderAttachableImpl<E> implements AppenderAttachable<E> { * */ public Appender<E> getAppender(String name) { + if(1==1) throw new IllegalStateException(""); if (name == null) { return null; } @@ -121,6 +127,7 @@ public class AppenderAttachableImpl<E> implements AppenderAttachable<E> { * @since 1.2 */ public boolean isAttached(Appender<E> appender) { + if(1==1) throw new IllegalStateException(""); if (appender == null) { return false; } @@ -143,6 +150,7 @@ public class AppenderAttachableImpl<E> implements AppenderAttachable<E> { * Remove and stop all previously attached appenders. */ public void detachAndStopAllAppenders() { + if(1==1) throw new IllegalStateException(""); w.lock(); try { for (Appender<E> a : appenderList) { @@ -154,11 +162,18 @@ public class AppenderAttachableImpl<E> implements AppenderAttachable<E> { } } + static final long START = System.currentTimeMillis(); + void p(String msg) { + System.out.println((System.currentTimeMillis()-START) + " "+ Thread.currentThread().getName() + msg); + //System.out.println("------------------------"); + + } /** * Remove the appender passed as parameter form the list of attached * appenders. */ public boolean detachAppender(Appender<E> appender) { + if(1==1) throw new IllegalStateException(""); if (appender == null) { return false; } @@ -177,6 +192,8 @@ public class AppenderAttachableImpl<E> implements AppenderAttachable<E> { * appenders. */ public boolean detachAppender(String name) { + if(1==1) throw new IllegalStateException(""); + if (name == null) { return false; } ----------------------------------------------------------------------- Summary of changes: .../logback/core/spi/AppenderAttachableImpl.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, lbcore224, created. v_0.9.30-6-g516d7f5
by git-noreply＠pixie.qos.ch 27 Sep '11

27 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, lbcore224 has been created at 516d7f5faca20df0de597916b7929eefa5ee053a (commit) - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=516d7f5faca20df0de597916… http://github.com/ceki/logback/commit/516d7f5faca20df0de597916b7929eefa5ee0… commit 516d7f5faca20df0de597916b7929eefa5ee053a Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Sep 27 15:41:11 2011 +0200 - Add test case - Given output prdoduced by LBCORE224Test.javam, the Reduce.java applicaiton can remove matching LOCK/UNLOCK lines making it much easier to interpret the output diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/LBCORE224Test.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/LBCORE224Test.java new file mode 100644 index 0000000..0c40880 --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/LBCORE224Test.java @@ -0,0 +1,30 @@ +package ch.qos.logback.classic.issue.lbcore224; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.util.StatusPrinter; +import org.apache.zookeeper.test.QuorumUtil; +import org.junit.After; +import org.junit.Test; +import org.slf4j.LoggerFactory; + + +public class LBCORE224Test { + + final QuorumUtil qU = new QuorumUtil(1); + + @After + public void teatDown() throws Exception { + Context context = (Context) LoggerFactory.getILoggerFactory(); + StatusPrinter.print(context); + qU.tearDown(); + } + + @Test + public void test() throws Exception { + for (int i = 0; i < 10; i++) { + qU.startQuorum(); + qU.shutdownAll(); + System.out.println(i); + } + } +} diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/Reduce.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/Reduce.java new file mode 100644 index 0000000..6699e67 --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore224/Reduce.java @@ -0,0 +1,160 @@ +package ch.qos.logback.classic.issue.lbcore224; + +import java.io.*; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Reduce a file consisting of lock and unlock operations by removing matching lock/unlocks. + */ +public class Reduce { + + static int NA = -1; + + enum OperationType {LOCK, UNLOCK} + + public static void main(String[] args) throws IOException { + File inputFile = new File(args[0]); + if(!inputFile.exists()) { + throw new IllegalArgumentException("Missing file ["+args[0]+"]"); + } + List<String> lines = readFile(inputFile); + System.out.println("Lines count=" + lines.size()); + List<Structure> structuredLines = structure(lines); + List<Structure> reduction = reduce(structuredLines); + if (reduction.isEmpty()) { + System.out.println("Reduction is EMPTY as it should be."); + } else { + System.out.println("Non-empty reduction!!! WTF?"); + System.out.println(reduction); + } + + + } + + private static List<String> readFile(File inputFile) throws IOException { + BufferedReader reader = null; + List<String> lines = new ArrayList(); + try { + reader = new BufferedReader(new FileReader(inputFile)); + String line; + while ((line = reader.readLine()) != null) { + lines.add(line); + } + } finally { + if (reader != null) + try { + reader.close(); + } catch (IOException e) { + } + } + return lines; + } + + private static List<Structure> reduce(List<Structure> structuredLines) { + List<Structure> matching = new ArrayList<Structure>(); + int lockIndex = 0; + while (lockIndex < structuredLines.size()) { + lockIndex = findNearestLock(structuredLines, lockIndex); + if (lockIndex == NA) + break; + else { + int unlockIndex = findNearestUnlockInSameThread(structuredLines, lockIndex); + if (unlockIndex != NA) { + matching.add(structuredLines.get(lockIndex)); + matching.add(structuredLines.get(unlockIndex)); + } + lockIndex++; + } + } + System.out.println("matching list size: " + matching.size()); + List<Structure> reduction = new ArrayList<Structure>(); + for (Structure s : structuredLines) { + if (!matching.contains(s)) { + reduction.add(s); + } + } + return reduction; + + } + + private static int findNearestLock(List<Structure> reduction, int index) { + for (int i = index; i < reduction.size(); i++) { + Structure s = reduction.get(i); + if (s.operationType == OperationType.LOCK) { + return i; + } + } + return NA; + } + + private static int findNearestUnlockInSameThread(List<Structure> reduction, int lockIndex) { + int firstCandidateIndex = lockIndex+1; + Structure lockStructure = reduction.get(lockIndex); + for (int i = firstCandidateIndex; i < reduction.size(); i++) { + Structure s = reduction.get(i); + if (s.operationType == OperationType.UNLOCK && lockStructure.thread.equals(s.thread)) { + return i; + } + } + return NA; + } + + static List<Structure> structure(List<String> lines) { + List<Structure> structuredLines = new ArrayList(); + Pattern p = Pattern.compile("(\\d{2,5})\\ +(.*) (LOCK|UNLOCK)"); + + for (String line : lines) { + Matcher m = p.matcher(line); + if (m.matches()) { + String relTime = m.group(1); + String t = m.group(2); + String opStr = m.group(3); + Structure structure = buildStructure(relTime, t, opStr); + structuredLines.add(structure); + } else { + System.out.println("NON MATCHING LINE: ["+ line+"]"); + } + + } + return structuredLines; + } + + private static Structure buildStructure(String relTime, String t, String opStr) { + long r = Long.parseLong(relTime); + OperationType operationType; + if (opStr.equals("LOCK")) + operationType = OperationType.LOCK; + else if (opStr.equals("UNLOCK")) { + operationType = OperationType.UNLOCK; + } else { + throw new IllegalArgumentException(opStr + " is not LOCK|UNLOCK"); + } + return new Structure(r, t, operationType); + } + + + static class Structure { + long time; + String thread; + OperationType operationType; + + Structure(long time, String thread, OperationType operationType) { + this.time = time; + this.thread = thread; + this.operationType = operationType; + } + + @Override + public String toString() { + return "Structure{" + + "time=" + time + + ", thread='" + thread + '\'' + + ", operationType=" + operationType + + '}'; + } + } + +} diff --git a/logback-classic/src/test/resources/logback-test.xml b/logback-classic/src/test/resources/logback-test.xml new file mode 100644 index 0000000..2c54715 --- /dev/null +++ b/logback-classic/src/test/resources/logback-test.xml @@ -0,0 +1,17 @@ +<configuration> + + + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <file>lbcore224.log</file> + <encoder> + <pattern>%logger{35} - %msg%n</pattern> + </encoder> + </appender> + + + + <root> + <level value="INFO" /> + <appender-ref ref="FILE" /> + </root> +</configuration> \ No newline at end of file ----------------------------------------------------------------------- hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.30-5-gce19ada
by git-noreply＠pixie.qos.ch 27 Sep '11

27 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via ce19ada3e6bb9aafbc8eccae93898e04de29e8ee (commit) from 3e9321697098752bbef50544f39ade7cc68e98a2 (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=ce19ada3e6bb9aafbc8eccae… http://github.com/ceki/logback/commit/ce19ada3e6bb9aafbc8eccae93898e04de29e… commit ce19ada3e6bb9aafbc8eccae93898e04de29e8ee Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Sep 27 15:24:21 2011 +0200 shorter author tag diff --git a/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 2fef705..0f8e6fe 100644 --- a/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/logback-classic/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -30,8 +30,7 @@ import ch.qos.logback.core.util.StatusPrinter; * The binding of {@link LoggerFactory} class with an actual instance of * {@link ILoggerFactory} is performed using information returned by this class. * - * @author <a href="http://www.qos.ch/shop/products/log4jManual">Ceki - * Gülcü</a> + * @author Ceki Gülcü</a> */ public class StaticLoggerBinder implements LoggerFactoryBinder { ----------------------------------------------------------------------- Summary of changes: .../java/org/slf4j/impl/StaticLoggerBinder.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.30-4-g3e93216
by git-noreply＠pixie.qos.ch 27 Sep '11

27 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 3e9321697098752bbef50544f39ade7cc68e98a2 (commit) from 6534cfcc93d86c742aec1bdbe5f1b8844e6bd988 (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=3e9321697098752bbef50544… http://github.com/ceki/logback/commit/3e9321697098752bbef50544f39ade7cc68e9… commit 3e9321697098752bbef50544f39ade7cc68e98a2 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Sep 27 09:22:15 2011 +0200 minro refactoring, cosmetic changes diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java b/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java index 2c0a06a..9071b03 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java +++ b/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java @@ -17,7 +17,6 @@ import java.io.File; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Properties; import ch.qos.logback.core.util.StatusPrinter; import org.eclipse.jetty.server.Request; @@ -39,10 +38,8 @@ import ch.qos.logback.core.spi.FilterAttachable; import ch.qos.logback.core.spi.FilterAttachableImpl; import ch.qos.logback.core.spi.FilterReply; import ch.qos.logback.core.status.ErrorStatus; -import ch.qos.logback.core.status.InfoStatus; import ch.qos.logback.core.status.WarnStatus; import ch.qos.logback.core.util.OptionHelper; -import org.eclipse.jetty.util.component.LifeCycle; /** * This class is logback's implementation of jetty's RequestLog interface. @@ -51,15 +48,15 @@ import org.eclipse.jetty.util.component.LifeCycle; * LoggerContext does. It also provides containers for properties. To * configure jetty in order to use RequestLogImpl, the following lines must be * added to the jetty configuration file, namely etc/jetty.xml: - * + * * <pre> - * <Ref id="requestLog"> - * <Set name="requestLog"> + * <Ref id="requestLog"> + * <Set name="requestLog"> * <New id="requestLogImpl" class="ch.qos.logback.access.jetty.RequestLogImpl"></New> - * </Set> + * </Set> * </Ref> * </pre> - * + * * By default, RequestLogImpl looks for a logback configuration file called * logback-access.xml, in the same folder where jetty.xml is located, that is * etc/logback-access.xml. The logback-access.xml file is slightly @@ -68,34 +65,34 @@ import org.eclipse.jetty.util.component.LifeCycle; * loggers elements are not allowed. It is possible to put the logback * configuration file anywhere, as long as it's path is specified. Here is * another example, with a path to the logback-access.xml file. - * + * * <pre> - * <Ref id="requestLog"> - * <Set name="requestLog"> + * <Ref id="requestLog"> + * <Set name="requestLog"> * <New id="requestLogImpl" class="ch.qos.logback.access.jetty.RequestLogImpl"></New> * <Set name="fileName">path/to/logback.xml</Set> - * </Set> + * </Set> * </Ref> * </pre> - * + * * Here is a sample logback-access.xml file that can be used right away: - * + * * <pre> - * <configuration> - * <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - * <layout class="ch.qos.logback.access.PatternLayout"> + * <configuration> + * <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + * <layout class="ch.qos.logback.access.PatternLayout"> * <param name="Pattern" value="%date %server %remoteIP %clientHost %user %requestURL" /> - * </layout> - * </appender> - * - * <appender-ref ref="STDOUT" /> + * </layout> + * </appender> + * + * <appender-ref ref="STDOUT" /> * </configuration> * </pre> - * + * * Another configuration file, using SMTPAppender, could be: - * + * * <pre> - * <configuration> + * <configuration> * <appender name="SMTP" class="ch.qos.logback.access.net.SMTPAppender"> * <layout class="ch.qos.logback.access.PatternLayout"> * <param name="pattern" value="%remoteIP [%date] %requestURL %statusCode %bytesSent" /> @@ -105,23 +102,24 @@ import org.eclipse.jetty.util.component.LifeCycle; * <param name="Subject" value="Last Event: %statusCode %requestURL" /> * <param name="To" value="server_admin(a)domain.org" /> * </appender> - * <appender-ref ref="SMTP" /> + * <appender-ref ref="SMTP" /> * </configuration> * </pre> - * + * * @author Ceki Gülcü * @author Sébastien Pennec */ public class RequestLogImpl extends ContextBase implements RequestLog, - AppenderAttachable<IAccessEvent>, FilterAttachable<IAccessEvent> { + AppenderAttachable<IAccessEvent>, FilterAttachable<IAccessEvent> { public final static String DEFAULT_CONFIG_FILE = "etc" + File.separatorChar - + "logback-access.xml"; + + "logback-access.xml"; AppenderAttachableImpl<IAccessEvent> aai = new AppenderAttachableImpl<IAccessEvent>(); FilterAttachableImpl<IAccessEvent> fai = new FilterAttachableImpl<IAccessEvent>(); - String filename; + String fileName; boolean started = false; + boolean quiet = false; public RequestLogImpl() { putObject(CoreConstants.EVALUATOR_MAP, new HashMap()); @@ -129,9 +127,9 @@ public class RequestLogImpl extends ContextBase implements RequestLog, public void log(Request jettyRequest, Response jettyResponse) { JettyServerAdapter adapter = new JettyServerAdapter(jettyRequest, - jettyResponse); + jettyResponse); IAccessEvent accessEvent = new AccessEvent(jettyRequest, jettyResponse, - adapter); + adapter); if (getFilterChainDecision(accessEvent) == FilterReply.DENY) { return; } @@ -139,37 +137,40 @@ public class RequestLogImpl extends ContextBase implements RequestLog, } public void start() { - Properties p = System.getProperties(); - System.out.println(p); - if (filename == null) { + if (fileName == null) { String jettyHomeProperty = OptionHelper.getSystemProperty("jetty.home"); - - filename = jettyHomeProperty + File.separatorChar + DEFAULT_CONFIG_FILE; - getStatusManager().add( - new WarnStatus("filename property not set. Assuming [" + filename - + "]", this)); - - } - try { - File configFile = new File(filename); - if (configFile.exists()) { - JoranConfigurator jc = new JoranConfigurator(); - jc.setContext(this); - jc.doConfigure(filename); - } else { + if (OptionHelper.isEmpty(jettyHomeProperty)) { getStatusManager().add( - new ErrorStatus("[" + filename + "] does not exist", this)); + new WarnStatus("[jetty.home] system property not set.", this)); + fileName = DEFAULT_CONFIG_FILE; + } else { + fileName = jettyHomeProperty + File.separatorChar + DEFAULT_CONFIG_FILE; } + getStatusManager().add( + new WarnStatus("fileName property not set. Assuming [" + fileName + + "]", this)); + } + File configFile = new File(fileName); + if (configFile.exists()) { + runJoranOnFile(configFile); + } else { + getStatusManager().add( + new ErrorStatus("Could not find logback-access configuration file [" + fileName + "]", this)); + } + if (!isQuiet()) { + StatusPrinter.print(getStatusManager()); + } + started = true; + } + private void runJoranOnFile(File configFile) { + try { + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(this); + jc.doConfigure(configFile); if (getName() == null) { setName("LogbackRequestLog"); } - RequestLogRegistry.register(this); - getStatusManager().add( - new InfoStatus("RequestLog added to RequestLogRegistry with name: " - + getName(), this)); - - started = true; } catch (JoranException e) { // errors have been registered as status messages } @@ -184,8 +185,8 @@ public class RequestLogImpl extends ContextBase implements RequestLog, return started; } - public void setFileName(String filename) { - this.filename = filename; + public void setFileName(String fileName) { + this.fileName = fileName; } public boolean isStarted() { @@ -208,6 +209,13 @@ public class RequestLogImpl extends ContextBase implements RequestLog, return false; } + public boolean isQuiet() { + return quiet; + } + + public void setQuiet(boolean quiet) { + this.quiet = quiet; + } public void addAppender(Appender<IAccessEvent> newAppender) { aai.addAppender(newAppender); @@ -249,7 +257,7 @@ public class RequestLogImpl extends ContextBase implements RequestLog, public List<Filter<IAccessEvent>> getCopyOfAttachedFiltersList() { return fai.getCopyOfAttachedFiltersList(); } - + public FilterReply getFilterChainDecision(IAccessEvent event) { return fai.getFilterChainDecision(event); } @@ -257,6 +265,7 @@ public class RequestLogImpl extends ContextBase implements RequestLog, public void addLifeCycleListener(Listener listener) { // we'll implement this when asked } + public void removeLifeCycleListener(Listener listener) { // we'll implement this when asked } diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogRegistry.java b/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogRegistry.java index f0dbc45..6eddce3 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogRegistry.java +++ b/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogRegistry.java @@ -16,6 +16,7 @@ package ch.qos.logback.access.jetty; import java.util.HashMap; import java.util.Map; +// this class is currently not used public class RequestLogRegistry { private static Map<String, RequestLogImpl> requestLogRegistry = new HashMap<String, RequestLogImpl>(); ----------------------------------------------------------------------- Summary of changes: .../qos/logback/access/jetty/RequestLogImpl.java | 125 +++++++++++--------- .../logback/access/jetty/RequestLogRegistry.java | 1 + 2 files changed, 68 insertions(+), 58 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.30-3-g6534cfc
by git-noreply＠pixie.qos.ch 25 Sep '11

25 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 6534cfcc93d86c742aec1bdbe5f1b8844e6bd988 (commit) from cdca3a24519d66a09e86b0dda5913e07b30d8031 (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=6534cfcc93d86c742aec1bdb… http://github.com/ceki/logback/commit/6534cfcc93d86c742aec1bdbe5f1b8844e6bd… commit 6534cfcc93d86c742aec1bdbe5f1b8844e6bd988 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Sun Sep 25 23:31:35 2011 +0200 - upgrade to Jetty 7 and Tomcat 7 - refactoring of Jetty related test cases diff --git a/logback-access/pom.xml b/logback-access/pom.xml index 0850d03..c5d59ad 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -48,17 +48,18 @@ <dependency> <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> + <artifactId>tomcat-catalina</artifactId> <scope>compile</scope> <optional>true</optional> </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> +  +  +  +  +  +  + <dependency> <groupId>org.eclipse.jetty</groupId> @@ -67,12 +68,12 @@ <optional>true</optional> </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api-2.5</artifactId> - <scope>compile</scope> - <optional>true</optional> - </dependency> +  +  +  +  +  +  <dependency> <groupId>janino</groupId> diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java b/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java index 951d9dc..bdb2fbe 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java +++ b/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java @@ -17,11 +17,12 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import org.mortbay.jetty.HttpFields; -import org.mortbay.jetty.Request; -import org.mortbay.jetty.Response; +import org.eclipse.jetty.http.HttpFields; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Response; import ch.qos.logback.access.spi.ServerAdapter; +import org.eclipse.jetty.server.Request; /** * A jetty specific implementation of the {@link ServerAdapter} interface. diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java b/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java index c8a7298..2c0a06a 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java +++ b/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java @@ -17,10 +17,13 @@ import java.io.File; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Properties; + +import ch.qos.logback.core.util.StatusPrinter; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.RequestLog; +import org.eclipse.jetty.server.Response; -import org.mortbay.jetty.Request; -import org.mortbay.jetty.RequestLog; -import org.mortbay.jetty.Response; import ch.qos.logback.access.joran.JoranConfigurator; import ch.qos.logback.access.spi.AccessEvent; @@ -39,6 +42,7 @@ import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.status.InfoStatus; import ch.qos.logback.core.status.WarnStatus; import ch.qos.logback.core.util.OptionHelper; +import org.eclipse.jetty.util.component.LifeCycle; /** * This class is logback's implementation of jetty's RequestLog interface. @@ -135,6 +139,8 @@ public class RequestLogImpl extends ContextBase implements RequestLog, } public void start() { + Properties p = System.getProperties(); + System.out.println(p); if (filename == null) { String jettyHomeProperty = OptionHelper.getSystemProperty("jetty.home"); @@ -150,7 +156,6 @@ public class RequestLogImpl extends ContextBase implements RequestLog, JoranConfigurator jc = new JoranConfigurator(); jc.setContext(this); jc.doConfigure(filename); - } else { getStatusManager().add( new ErrorStatus("[" + filename + "] does not exist", this)); @@ -165,7 +170,6 @@ public class RequestLogImpl extends ContextBase implements RequestLog, + getName(), this)); started = true; - } catch (JoranException e) { // errors have been registered as status messages } @@ -204,6 +208,7 @@ public class RequestLogImpl extends ContextBase implements RequestLog, return false; } + public void addAppender(Appender<IAccessEvent> newAppender) { aai.addAppender(newAppender); } @@ -249,4 +254,11 @@ public class RequestLogImpl extends ContextBase implements RequestLog, return fai.getFilterChainDecision(event); } + public void addLifeCycleListener(Listener listener) { + // we'll implement this when asked + } + public void removeLifeCycleListener(Listener listener) { + // we'll implement this when asked + } + } diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/package.html b/logback-access/src/main/java/ch/qos/logback/access/jetty/package.html index 20a34c3..bc2c3dc 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/jetty/package.html +++ b/logback-access/src/main/java/ch/qos/logback/access/jetty/package.html @@ -7,7 +7,7 @@ <body> - This is logback access' implementation for Jetty. + This is logback access' implementation for Jetty 8. </body> </html> \ No newline at end of file diff --git a/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java b/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java index 21fe551..ede5b77 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java +++ b/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java @@ -24,6 +24,8 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import ch.qos.logback.access.spi.IAccessEvent; +//import org.apache.catalina.Lifecycle; +import ch.qos.logback.core.spi.*; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleListener; import org.apache.catalina.connector.Request; @@ -39,11 +41,6 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.joran.spi.JoranException; -import ch.qos.logback.core.spi.AppenderAttachable; -import ch.qos.logback.core.spi.AppenderAttachableImpl; -import ch.qos.logback.core.spi.FilterAttachable; -import ch.qos.logback.core.spi.FilterAttachableImpl; -import ch.qos.logback.core.spi.FilterReply; import ch.qos.logback.core.status.InfoStatus; import ch.qos.logback.core.status.StatusManager; import ch.qos.logback.core.status.WarnStatus; @@ -91,7 +88,11 @@ public class LogbackValve extends ValveBase implements Lifecycle, Context, putObject(CoreConstants.EVALUATOR_MAP, new HashMap()); } - public void start() { + public boolean isStarted() { + return started; + } + + public void startInternal() { if (filename == null) { String tomcatHomeProperty = OptionHelper .getSystemProperty("catalina.home"); @@ -172,7 +173,7 @@ public class LogbackValve extends ValveBase implements Lifecycle, Context, } } - public void stop() { + public void stopInternal() { started = false; } diff --git a/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java b/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java index f9de7d4..db3d9f2 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java @@ -17,16 +17,10 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.security.Principal; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Locale; -import java.util.Map; +import java.util.*; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletInputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import javax.servlet.*; +import javax.servlet.http.*; import ch.qos.logback.access.AccessConstants; @@ -141,6 +135,26 @@ public class DummyRequest implements HttpServletRequest { return false; } + public boolean authenticate(HttpServletResponse response) throws IOException, ServletException { + return false; //To change body of implemented methods use File | Settings | File Templates. + } + + public void login(String username, String password) throws ServletException { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void logout() throws ServletException { + //To change body of implemented methods use File | Settings | File Templates. + } + + public Collection<Part> getParts() throws IOException, IllegalStateException, ServletException { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public Part getPart(String name) throws IOException, IllegalStateException, ServletException { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + public boolean isRequestedSessionIdValid() { return false; } @@ -193,6 +207,34 @@ public class DummyRequest implements HttpServletRequest { return 11; } + public ServletContext getServletContext() { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public AsyncContext startAsync() { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public boolean isAsyncStarted() { + return false; //To change body of implemented methods use File | Settings | File Templates. + } + + public boolean isAsyncSupported() { + return false; //To change body of implemented methods use File | Settings | File Templates. + } + + public AsyncContext getAsyncContext() { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public DispatcherType getDispatcherType() { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + public Locale getLocale() { return null; } diff --git a/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyResponse.java b/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyResponse.java index 3fd3691..2281eec 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyResponse.java +++ b/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyResponse.java @@ -15,9 +15,7 @@ package ch.qos.logback.access.dummy; import java.io.IOException; import java.io.PrintWriter; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; +import java.util.*; import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; @@ -27,16 +25,17 @@ public class DummyResponse implements HttpServletResponse { public static final int DUMMY_DEFAULT_STATUS = 200; public static final int DUMMY_DEFAULT_CONTENT_COUNT = 1000; - public static final Map<String, String> DUMMY_DEFAULT_HDEADER_MAP = new HashMap<String, String>();; - + public static final Map<String, String> DUMMY_DEFAULT_HDEADER_MAP = new HashMap<String, String>(); + ; + static { DUMMY_DEFAULT_HDEADER_MAP.put("headerName1", "headerValue1"); DUMMY_DEFAULT_HDEADER_MAP.put("headerName2", "headerValue2"); } - - int status = DUMMY_DEFAULT_STATUS ; + + int status = DUMMY_DEFAULT_STATUS; public Map<String, String> headerMap; - + public DummyResponse() { headerMap = DUMMY_DEFAULT_HDEADER_MAP; } @@ -145,15 +144,27 @@ public class DummyResponse implements HttpServletResponse { public void setLocale(Locale arg0) { } - + public String getHeader(String key) { return headerMap.get(key); } - + + public Collection<String> getHeaders(String name) { + String val = headerMap.get(name); + List list = new ArrayList(); + if (val != null) + list.add(val); + return list; + } + + public Collection<String> getHeaderNames() { + return headerMap.keySet(); + } + public long getContentCount() { return DUMMY_DEFAULT_CONTENT_COUNT; } - + public int getStatus() { return status; } @@ -161,5 +172,5 @@ public class DummyResponse implements HttpServletResponse { public void setStatus(int status) { this.status = status; } - + } diff --git a/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java b/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java index ec43ab4..b6a9d58 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java @@ -33,21 +33,19 @@ import ch.qos.logback.core.testUtil.RandomUtil; public class JettyBasicTest { static RequestLogImpl REQYEST_LOG_IMPL; - static JettyFixture JETTY_FIXTURE; + static JettyFixtureWithListAndConsoleAppenders JETTY_FIXTURE; static int RANDOM_SERVER_PORT = RandomUtil.getRandomServerPort(); @BeforeClass static public void startServer() throws Exception { - // System.out.println("*** JettyBasicTest.startServer called"); REQYEST_LOG_IMPL = new RequestLogImpl(); - JETTY_FIXTURE = new JettyFixture(REQYEST_LOG_IMPL, RANDOM_SERVER_PORT); + JETTY_FIXTURE = new JettyFixtureWithListAndConsoleAppenders(REQYEST_LOG_IMPL, RANDOM_SERVER_PORT); JETTY_FIXTURE.start(); } @AfterClass static public void stopServer() throws Exception { - // System.out.println("*** JettyBasicTest.stopServer called"); if (JETTY_FIXTURE != null) { JETTY_FIXTURE.stop(); } diff --git a/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixture.java b/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixture.java deleted file mode 100644 index a6efecd..0000000 --- a/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixture.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * Logback: the reliable, generic, fast and flexible logging framework. - * Copyright (C) 1999-2011, QOS.ch. All rights reserved. - * - * This program and the accompanying materials are dual-licensed under - * either the terms of the Eclipse Public License v1.0 as published by - * the Eclipse Foundation - * - * or (per the licensee's choosing) - * - * under the terms of the GNU Lesser General Public License version 2.1 - * as published by the Free Software Foundation. - */ -package ch.qos.logback.access.jetty; - -import java.io.IOException; -import java.io.OutputStream; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import ch.qos.logback.access.spi.IAccessEvent; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.HttpConnection; -import org.mortbay.jetty.Request; -import org.mortbay.jetty.handler.AbstractHandler; -import org.mortbay.util.ByteArrayISO8859Writer; - -import ch.qos.logback.access.PatternLayoutEncoder; -import ch.qos.logback.access.testUtil.NotifyingListAppender; -import ch.qos.logback.core.ConsoleAppender; - -public class JettyFixture extends JettyFixtureBase { - - Handler handler = new BasicHandler(); - - public JettyFixture(RequestLogImpl impl, int port) { - super(impl, port); - url = "http://localhost:" + port + "/"; - } - - public void start() throws Exception { - super.start(); - Thread.yield(); - } - - public void stop() throws Exception { - super.stop(); - Thread.sleep(500); - } - - protected void buildContext() { - NotifyingListAppender appender = new NotifyingListAppender(); - appender.setContext(requestLogImpl); - appender.setName("list"); - appender.start(); - - ConsoleAppender<IAccessEvent> console = new ConsoleAppender<IAccessEvent>(); - console.setContext(requestLogImpl); - console.setName("console"); - PatternLayoutEncoder layout = new PatternLayoutEncoder(); - layout.setContext(requestLogImpl); - layout.setPattern("%date %server %clientHost"); - console.setEncoder(layout); - layout.start(); - console.start(); - - requestLogImpl.addAppender(appender); - requestLogImpl.addAppender(console); - } - - @Override - protected Handler getHandler() { - return handler; - } - -} - -class BasicHandler extends AbstractHandler { - public void handle(String target, HttpServletRequest request, - HttpServletResponse response, int dispatch) throws IOException, - ServletException { - - // String requestContent = Util.readToString(request.getInputStream()); - // System.out.println("request content: " + requestContent); - - OutputStream out = response.getOutputStream(); - ByteArrayISO8859Writer writer = new ByteArrayISO8859Writer(); - writer.write("hello world"); - writer.flush(); - response.setContentLength(writer.size()); - writer.writeTo(out); - out.flush(); - - Request base_request = (request instanceof Request) ? (Request) request - : HttpConnection.getCurrentConnection().getRequest(); - base_request.setHandled(true); - - } -} diff --git a/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureBase.java b/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureBase.java index bc0b4df..e4279cb 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureBase.java +++ b/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureBase.java @@ -13,20 +13,29 @@ */ package ch.qos.logback.access.jetty; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.handler.ContextHandler; -import org.mortbay.jetty.handler.RequestLogHandler; -import org.mortbay.jetty.nio.SelectChannelConnector; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.AbstractHandler; +import org.eclipse.jetty.server.handler.HandlerList; +import org.eclipse.jetty.server.handler.RequestLogHandler; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.util.ByteArrayISO8859Writer; -abstract public class JettyFixtureBase { - protected RequestLogImpl requestLogImpl; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +public class JettyFixtureBase { + final protected RequestLogImpl requestLogImpl; + protected Handler handler = new BasicHandler(); private final int port; Server server; - String url; - + protected String url; + public JettyFixtureBase(RequestLogImpl impl, int port) { requestLogImpl = impl; this.port = port; @@ -45,32 +54,48 @@ abstract public class JettyFixtureBase { server = new Server(); Connector connector = new SelectChannelConnector(); connector.setPort(port); - server.setConnectors(new Connector[] { connector }); - - ContextHandler context = new ContextHandler(); - context.setContextPath("/"); - context.setResourceBase("."); - context.setClassLoader(Thread.currentThread().getContextClassLoader()); - server.addHandler(context); + server.setConnectors(new Connector[]{connector}); RequestLogHandler requestLogHandler = new RequestLogHandler(); - buildContext(); + configureRequestLogImpl(); requestLogHandler.setRequestLog(requestLogImpl); - server.addHandler(requestLogHandler); - Handler handler = getHandler(); - context.addHandler(handler); + HandlerList handlers = new HandlerList(); + handlers.addHandler(requestLogHandler); + handlers.addHandler(getRequestHandler()); + server.setHandler(handlers); server.start(); } public void stop() throws Exception { - // System.out.println("into tearDown"); server.stop(); server = null; - requestLogImpl = null; } - abstract protected void buildContext(); - abstract protected Handler getHandler(); + protected void configureRequestLogImpl() { + requestLogImpl.start(); + } + + protected Handler getRequestHandler() { + return handler; + } + + + class BasicHandler extends AbstractHandler { + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + OutputStream out = response.getOutputStream(); + ByteArrayISO8859Writer writer = new ByteArrayISO8859Writer(); + writer.write("hello world"); + writer.flush(); + response.setContentLength(writer.size()); + writer.writeTo(out); + out.flush(); + + baseRequest.setHandled(true); + + } + } } + + diff --git a/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureWithListAndConsoleAppenders.java b/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureWithListAndConsoleAppenders.java new file mode 100644 index 0000000..9f40a10 --- /dev/null +++ b/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureWithListAndConsoleAppenders.java @@ -0,0 +1,59 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2011, QOS.ch. All rights reserved. + * + * This program and the accompanying materials are dual-licensed under + * either the terms of the Eclipse Public License v1.0 as published by + * the Eclipse Foundation + * + * or (per the licensee's choosing) + * + * under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation. + */ +package ch.qos.logback.access.jetty; + +import ch.qos.logback.access.spi.IAccessEvent; +import ch.qos.logback.access.PatternLayoutEncoder; +import ch.qos.logback.access.testUtil.NotifyingListAppender; +import ch.qos.logback.core.ConsoleAppender; + +public class JettyFixtureWithListAndConsoleAppenders extends JettyFixtureBase { + + public JettyFixtureWithListAndConsoleAppenders(RequestLogImpl impl, int port) { + super(impl, port); + url = "http://localhost:" + port + "/"; + } + + public void start() throws Exception { + super.start(); + Thread.yield(); + } + + public void stop() throws Exception { + super.stop(); + Thread.sleep(500); + } + + @Override + protected void configureRequestLogImpl() { + NotifyingListAppender appender = new NotifyingListAppender(); + appender.setContext(requestLogImpl); + appender.setName("list"); + appender.start(); + + ConsoleAppender<IAccessEvent> console = new ConsoleAppender<IAccessEvent>(); + console.setContext(requestLogImpl); + console.setName("console"); + PatternLayoutEncoder layout = new PatternLayoutEncoder(); + layout.setContext(requestLogImpl); + layout.setPattern("%date %server %clientHost"); + console.setEncoder(layout); + layout.start(); + console.start(); + + requestLogImpl.addAppender(appender); + requestLogImpl.addAppender(console); + } +} + diff --git a/logback-access/src/test/java/ch/qos/logback/access/sift/JettyFixture.java b/logback-access/src/test/java/ch/qos/logback/access/sift/JettyFixture.java deleted file mode 100644 index 470e791..0000000 --- a/logback-access/src/test/java/ch/qos/logback/access/sift/JettyFixture.java +++ /dev/null @@ -1,72 +0,0 @@ -/** - * Logback: the reliable, generic, fast and flexible logging framework. - * Copyright (C) 1999-2011, QOS.ch. All rights reserved. - * - * This program and the accompanying materials are dual-licensed under - * either the terms of the Eclipse Public License v1.0 as published by - * the Eclipse Foundation - * - * or (per the licensee's choosing) - * - * under the terms of the GNU Lesser General Public License version 2.1 - * as published by the Free Software Foundation. - */ -package ch.qos.logback.access.sift; - -import java.io.IOException; -import java.io.OutputStream; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.HttpConnection; -import org.mortbay.jetty.Request; -import org.mortbay.jetty.handler.AbstractHandler; -import org.mortbay.util.ByteArrayISO8859Writer; - -import ch.qos.logback.access.jetty.JettyFixtureBase; -import ch.qos.logback.access.jetty.RequestLogImpl; - -public class JettyFixture extends JettyFixtureBase { - - Handler handler = new BasicHandler(); - - public JettyFixture(RequestLogImpl impl, int port) { - super(impl, port); - } - - @Override - protected void buildContext() { - requestLogImpl.start(); - } - - @Override - protected Handler getHandler() { - return handler; - } - - class BasicHandler extends AbstractHandler { - public void handle(String target, HttpServletRequest request, - HttpServletResponse response, int dispatch) throws IOException, - ServletException { - - // String requestContent = Util.readToString(request.getInputStream()); - // System.out.println("request content: " + requestContent); - - OutputStream out = response.getOutputStream(); - ByteArrayISO8859Writer writer = new ByteArrayISO8859Writer(); - writer.write("hello world"); - writer.flush(); - response.setContentLength(writer.size()); - writer.writeTo(out); - out.flush(); - - Request base_request = (request instanceof Request) ? (Request) request - : HttpConnection.getCurrentConnection().getRequest(); - base_request.setHandled(true); - - } - } -} diff --git a/logback-access/src/test/java/ch/qos/logback/access/sift/SiftingAppenderTest.java b/logback-access/src/test/java/ch/qos/logback/access/sift/SiftingAppenderTest.java index 8168aaa..7e7231d 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/sift/SiftingAppenderTest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/sift/SiftingAppenderTest.java @@ -20,6 +20,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; +import ch.qos.logback.access.jetty.JettyFixtureBase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -35,13 +36,12 @@ public class SiftingAppenderTest { static final String PREFIX = "src/test/input/jetty/"; static int RANDOM_SERVER_PORT = RandomUtil.getRandomServerPort(); - JettyFixture jettyFixture; + JettyFixtureBase jettyFixture; RequestLogImpl rli = new RequestLogImpl(); @Before public void startServer() throws Exception { - jettyFixture = new JettyFixture(rli, RANDOM_SERVER_PORT); - + jettyFixture = new JettyFixtureBase(rli, RANDOM_SERVER_PORT); } @After @@ -52,18 +52,15 @@ public class SiftingAppenderTest { } @Test - public void test() throws Exception { + public void invokingDifferentPathShouldBeSiftedAccordingly() throws Exception { rli.setFileName(PREFIX + "sifting.xml"); jettyFixture.start(); - - StatusPrinter.print(rli); invokeServer("/"); invokeServer("/x"); invokeServer("/x"); invokeServer("/y"); - SiftingAppender siftingAppender = (SiftingAppender) rli .getAppender("SIFTING"); List<String> keyList = siftingAppender.getAppenderTracker().keyList(); @@ -76,22 +73,16 @@ public class SiftingAppenderTest { assertEquals(witnessList, keyList); long now = System.currentTimeMillis(); - { - ListAppender<IAccessEvent> listAppender = (ListAppender<IAccessEvent>) siftingAppender - .getAppenderTracker().get("NA", now); - assertEquals(1, listAppender.list.size()); - } - - { - ListAppender<IAccessEvent> listAppender = (ListAppender<IAccessEvent>) siftingAppender - .getAppenderTracker().get("x", now); - assertEquals(2, listAppender.list.size()); - } - { - ListAppender<IAccessEvent> listAppender = (ListAppender<IAccessEvent>) siftingAppender - .getAppenderTracker().get("y", now); - assertEquals(1, listAppender.list.size()); - } + check(siftingAppender, "NA", 1, now); + check(siftingAppender, "x", 2, now); + check(siftingAppender, "y", 1, now); + + } + + private void check(SiftingAppender siftingAppender, String key, int expectedCount, long now) { + ListAppender<IAccessEvent> listAppender = (ListAppender<IAccessEvent>) siftingAppender + .getAppenderTracker().get(key, now); + assertEquals(expectedCount, listAppender.list.size()); } void invokeServer(String uri) throws Exception { @@ -99,6 +90,6 @@ public class SiftingAppenderTest { HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setDoInput(true); Util.readToString(connection.getInputStream()); - Thread.sleep(30); + Thread.sleep(10); } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java b/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java index a0d72d0..97a7258 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java @@ -128,7 +128,7 @@ public abstract class SMTPAppenderBase<E> extends AppenderBase<E> { addError("Both SSL and StartTLS cannot be enabled simultaneously"); } else { if (isSTARTTLS()) { - props.setProperty("mail.smtp.auth", "true"); + //props.setProperty("mail.smtp.auth", "true"); props.put("mail.smtp.starttls.enable", "true"); } if (isSSL()) { diff --git a/logback-site/src/site/pages/access.html b/logback-site/src/site/pages/access.html index eba8f76..2fe4f94 100644 --- a/logback-site/src/site/pages/access.html +++ b/logback-site/src/site/pages/access.html @@ -164,18 +164,19 @@ logback-core-VERSION.jar and logback-access-VERSION.jar under $JETTY_HOME/lib directory, where $JETTY_HOME is the folder where you have - installed Jetty. We have tested logback-access module with Jetty - version 6.0 as well as 6.1. + installed Jetty. Versions of logback-access 0.9.31 and later taget + Jetty version 7.x as well as 8.x. Logback-access versions 0.9.30 + and earlier target Jetty version 6.x. <h3>Logback's implementation of - <code>org.mortbay.jetty.RequestLog</code> interface</h3> + <code>org.eclipse.jetty.server.RequestLog</code> interface</h3> The <a href="xref/ch/qos/logback/access/jetty/RequestLogImpl.html"> <code>ch.qos.logback.access.jetty.RequestLogImpl</code></a> class implements Jetty's <code><a - href="http://jetty.mortbay.org/apidocs/org/mortbay/jetty/RequestLog.html">RequestLog</a></code> + href="http://download.eclipse.org/jetty/stable-7/apidocs/org/eclipse/jetty/server…">RequestLog</a></code> interface. Jetty delegates the management of access logging functionality to implementations of this interface. @@ -202,15 +203,14 @@ By default, <code>RequestLogImpl</code> looks for a logback configuration file called logback-access.xml, in the same folder where jetty.xml is located. This configuration - file contains directives for configuring logback components. Among - others, you can specify the appenders where the logging requests - will be sent, and their format. + file contains directives for configuring logback components such + as appenders and layouts. As long the path is specified, you can place the logback configuration file in any location. Here is another example of a - Jetty configuration file, including the path to the - logback-access.xml configuration file. + Jetty configuration file, including the path to the logback-access + configuration file here named myaccess.xml. <pre class="prettyprint source"><Ref id="requestLog"> diff --git a/pom.xml b/pom.xml index 33e54a8..2fc2208 100755 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,9 @@ <groovy.version>1.7.6</groovy.version> <surefire.version>2.6</surefire.version> <consolePlugin.version>1.1.0</consolePlugin.version> + <tomcat.version>7.0.21</tomcat.version> + <jetty.version>7.5.1.v20110908</jetty.version> +  </properties> <dependencies> @@ -131,8 +134,8 @@ <dependency> <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> - <version>6.0.20</version> + <artifactId>tomcat-catalina</artifactId> + <version>${tomcat.version}</version> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> @@ -142,13 +145,15 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>7.0.1.v20091125</version> + <version>${jetty.version}</version> </dependency> +  <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 27 +++--- .../logback/access/jetty/JettyServerAdapter.java | 7 +- .../qos/logback/access/jetty/RequestLogImpl.java | 22 ++++- .../java/ch/qos/logback/access/jetty/package.html | 2 +- .../ch/qos/logback/access/tomcat/LogbackValve.java | 15 ++-- .../ch/qos/logback/access/dummy/DummyRequest.java | 60 ++++++++++-- .../ch/qos/logback/access/dummy/DummyResponse.java | 35 +++++--- .../qos/logback/access/jetty/JettyBasicTest.java | 6 +- .../ch/qos/logback/access/jetty/JettyFixture.java | 101 -------------------- .../qos/logback/access/jetty/JettyFixtureBase.java | 75 ++++++++++----- .../JettyFixtureWithListAndConsoleAppenders.java | 59 ++++++++++++ .../ch/qos/logback/access/sift/JettyFixture.java | 72 -------------- .../logback/access/sift/SiftingAppenderTest.java | 39 +++----- .../ch/qos/logback/core/net/SMTPAppenderBase.java | 2 +- logback-site/src/site/pages/access.html | 18 ++-- pom.xml | 11 ++- 16 files changed, 262 insertions(+), 289 deletions(-) delete mode 100644 logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixture.java create mode 100644 logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureWithListAndConsoleAppenders.java delete mode 100644 logback-access/src/test/java/ch/qos/logback/access/sift/JettyFixture.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-217) Exception stack trace printing starting from root cause
by Tomasz Nurkiewicz (JIRA) 24 Sep '11

24 Sep '11

Exception stack trace printing starting from root cause ------------------------------------------------------- Key: LBCLASSIC-217 URL: http://jira.qos.ch/browse/LBCLASSIC-217 Project: logback-classic Issue Type: New Feature Affects Versions: 0.9.22 Reporter: Tomasz Nurkiewicz Assignee: Logback dev list A typical exception in multi-tier application looks similar to this: com.acme.BusinessException: Can't process request at ... at ... Caused by: com.acme.dao.PersistenceException: Can't access database at ... at ... ... 49 common frames omitted Caused by: org.springframework.jdbc.datasource.lookup.DataSourceLookupFailureException: Unable to locate datasource at ... at ... ... 65 common frames omitted Caused by: java.net.UnknownHostException: Unknown host localhostt at ... at ... ... 84 common frames omitted The deeper exception, the more specific information it gives. Typically the last "Caused by" is the most interesting one. So it seems like reversing the order in which the exceptions are thrown (from most specific to consecutive, less specific wrappers) might be more intuitive: java.net.UnknownHostException: Unknown host localhostt at ... at ... Wrapped by: org.springframework.jdbc.datasource.lookup.DataSourceLookupFailureException: Unable to connect to the database at ... at ... Wrapped by: com.acme.dao.PersistenceException: Can't access database at ... at ... Wrapped by: com.acme.BusinessException: Can't process request at ... at ... It is not only easier to read and follow (business exception is interesting for the end user while the most precise, technical information is for developers and system administrators - so it should be easily accessible in the logs), but also the stack trace isn't mixed. You can read stack frames in exactly the same order as they were executed, no need to jump from one stack trace line to another (see attachment from the real application). This also means that the beginning of the thread is always at the bottom and the line that caused the very first exception - at the top. (look at the attached real exception) I already implemented this feature by adding RootCauseFirstThrowableProxyConverter extending ch.qos.logback.classic.pattern.ExtendedThrowableProxyConverter. It is turned on by appending "%rEx" to the encoder pattern. If you like this feature, I will push the changes (just few classes have changed) into my GitHub fork. -- 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 8

[JIRA] Created: (LBCORE-223) Add Case Insensitive Contains Predicate to Joran
by Gordon Dickens (JIRA) 22 Sep '11

22 Sep '11

Add Case Insensitive Contains Predicate to Joran ------------------------------------------------ Key: LBCORE-223 URL: http://jira.qos.ch/browse/LBCORE-223 Project: logback-core Issue Type: Improvement Components: Joran Affects Versions: 0.9.30 Reporter: Gordon Dickens Assignee: Logback dev list Priority: Minor As a developer, it would be helpful to have evaluate a property value with case insensitivity. This issue became apparent when importing properties from a file where a property's value could be true or false. Here another person may put in TRUE or FALSE. To circumvent this, I have to include a comment. -- 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