November 2011 - logback-dev

[JIRA] Created: (LBCLASSIC-303) LoggingEvent.getCallerData() fails when called from a sub class
by Greg Thomas (JIRA) 03 Nov '11

03 Nov '11

LoggingEvent.getCallerData() fails when called from a sub class --------------------------------------------------------------- Key: LBCLASSIC-303 URL: http://jira.qos.ch/browse/LBCLASSIC-303 Project: logback-classic Issue Type: Bug Affects Versions: 1.0.0 Reporter: Greg Thomas Assignee: Logback dev list This is probably best demonstrated with a code example; package com.example; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.LoggingEvent; public class Test { Logger logger; public static void main(String[] args) { Test test = new Test(); test.go(); } private void go() { SuperClass anotherClass = new SuperClass(); anotherClass.go(); anotherClass = new SubClass(); anotherClass.go(); } private class SuperClass { public void go() { LoggerContext lc = new LoggerContext(); lc.setName("default"); // ... a logger logger = lc.getLogger("root"); LoggingEvent le = new LoggingEvent(this.getClass().getName(), logger, Level.DEBUG, "Test logging event", new Exception( "test Ex"), new String[] { "something" }); StackTraceElement[] callerData = le.getCallerData(); System.out.println("LoggingEvent in " + this.getClass().getName() + " has " + callerData.length + " stack trace elements:"); for (StackTraceElement stackTraceElement : callerData) { System.out.println("Element=" + stackTraceElement); } } } private class SubClass extends SuperClass { } } The output of this is as follows; LoggingEvent in com.example.Test$SuperClass has 2 stack trace elements: Element=com.example.Test.go(Test.java:20) Element=com.example.Test.main(Test.java:14) LoggingEvent in com.example.Test$SubClass has 0 stack trace elements: This is despite exactly the same go() method being called; it's not being modified in the subclass. Note that although the example uses inner classes, the same behaviour is exhibited in regular classes too. -- 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 9

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.0-8-gbe9513c
by git-noreply＠pixie.qos.ch 02 Nov '11

02 Nov '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 be9513c71eb0ed9869f6269b01dd0151c114a169 (commit) from 518594a3755cd35892a01a235932de56c7e2b898 (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=be9513c71eb0ed9869f6269b… http://github.com/ceki/logback/commit/be9513c71eb0ed9869f6269b01dd0151c114a… commit be9513c71eb0ed9869f6269b01dd0151c114a169 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Nov 2 18:24:14 2011 +0100 started working on LBCORE-226 diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java index 1a90833..0981f1f 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java @@ -33,7 +33,7 @@ import ch.qos.logback.core.rolling.helper.*; public class TimeBasedRollingPolicy<E> extends RollingPolicyBase implements TriggeringPolicy<E> { static final String FNP_NOT_SET = "The FileNamePattern option must be set before using TimeBasedRollingPolicy. "; - static final int NO_DELETE_HISTORY = 0; + static final int INFINITE_HISTORY = 0; // WCS: without compression suffix FileNamePattern fileNamePatternWCS; @@ -42,11 +42,13 @@ public class TimeBasedRollingPolicy<E> extends RollingPolicyBase implements private RenameUtil renameUtil = new RenameUtil(); Future<?> future; - private int maxHistory = NO_DELETE_HISTORY; + private int maxHistory = INFINITE_HISTORY; private ArchiveRemover archiveRemover; TimeBasedFileNamingAndTriggeringPolicy<E> timeBasedFileNamingAndTriggeringPolicy; + boolean cleanHistoryOnStart = false; + public void start() { // set the LR for our utility object renameUtil.setContext(this.context); @@ -87,9 +89,12 @@ public class TimeBasedRollingPolicy<E> extends RollingPolicyBase implements // the maxHistory property is given to TimeBasedRollingPolicy instead of to // the TimeBasedFileNamingAndTriggeringPolicy. This makes it more convenient // for the user at the cost of inconsistency here. - if (maxHistory != NO_DELETE_HISTORY) { + if (maxHistory != INFINITE_HISTORY) { archiveRemover = timeBasedFileNamingAndTriggeringPolicy.getArchiveRemover(); archiveRemover.setMaxHistory(maxHistory); + if(cleanHistoryOnStart) { + archiveRemover.clean(new Date(timeBasedFileNamingAndTriggeringPolicy.getCurrentTime())); + } } super.start(); @@ -204,6 +209,21 @@ public class TimeBasedRollingPolicy<E> extends RollingPolicyBase implements this.maxHistory = maxHistory; } + + public boolean isCleanHistoryOnStart() { + return cleanHistoryOnStart; + } + + /** + * Should archive removal be attempted on application start up? Default is false. + * @since 1.0.1 + * @param cleanHistoryOnStart + */ + public void setCleanHistoryOnStart(boolean cleanHistoryOnStart) { + this.cleanHistoryOnStart = cleanHistoryOnStart; + } + + @Override public String toString() { return "c.q.l.core.rolling.TimeBasedRollingPolicy"; ----------------------------------------------------------------------- Summary of changes: .../core/rolling/TimeBasedRollingPolicy.java | 26 +++++++++++++++++-- 1 files changed, 23 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-230) System Properties should override properties in logback.xml (not the other way around)
by Eric Sirianni (JIRA) 02 Nov '11

02 Nov '11

System Properties should override properties in logback.xml (not the other way around) -------------------------------------------------------------------------------------- Key: LBCORE-230 URL: http://jira.qos.ch/browse/LBCORE-230 Project: logback-core Issue Type: Improvement Affects Versions: 0.9.29 Reporter: Eric Sirianni Assignee: Logback dev list Priority: Minor >From the logback configuration guide (http://logback.qos.ch/manual/configuration.html) "The property is not declared in the configuration file, thus logback will look for it in the System properties. Java system properties can be set on the command line. " I believe the precedence should be reversed. Typically, system properties are used to *override* default values of properties that are specified in XML files or property files (typically checked into source control). Please consider this enhancement. For backwards compatibility you may want to add an option to toggle the precedence ordering. -- 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 4

Adding Logback-Gelf to downloads page
by Anthony Marcar 02 Nov '11

02 Nov '11

Hi all, First time posting to the list. Congrats on turning 1.0.0. I've written a logback appender that sends log messages to a Graylog2<http://www.graylog2.org/> server. Graylog2 is an open source project that provides a java server to store incoming logs in MongoDB, and a RoR web interface to view those logs. And it's awesome. My plugin, Logback-Gelf <https://github.com/Moocar/logback-gelf>, has been out in the wild for about 6 months so I thought I'd see if I could get it added to the third-party tools section on the logback downloads page. Cheers! Anthony @Moocar <http://twitter.com/#!/Moocar>

2 1

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.0-7-g518594a
by git-noreply＠pixie.qos.ch 02 Nov '11

02 Nov '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 518594a3755cd35892a01a235932de56c7e2b898 (commit) from d101cc04bde5ec993119697eca1890e5eb228b83 (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=518594a3755cd35892a01a23… http://github.com/ceki/logback/commit/518594a3755cd35892a01a235932de56c7e2b… commit 518594a3755cd35892a01a235932de56c7e2b898 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Nov 2 10:55:56 2011 +0100 add link to logback-gelf diff --git a/logback-site/src/site/pages/download.html b/logback-site/src/site/pages/download.html index 57188a9..d3b68a2 100644 --- a/logback-site/src/site/pages/download.html +++ b/logback-site/src/site/pages/download.html @@ -154,8 +154,7 @@  <dt> <a href="http://perf4j.codehaus.org/">Perf4J</a> by Alex - Devine, Doran Chakraborty, Chris Berry, Bryon Jacob, Alex - Victoria, Xu Huisheng and Stevo Slavic. + Devine, Doran Chakraborty et al. </dt> <dd> @@ -163,6 +162,19 @@ performance statistics for Java code. </dd> + +  + <dt> + <a + href="https://github.com/Moocar/logback-gelf">Logback-gelf</a> + by Anthony Marcar + </dt> + + <dd>Logback-gelf can log messages to a <a + href="http://graylog2.org/">Graylog2</a> server via GELF + messages. + </dd> + </dl> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/download.html | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBACCESS-26) Can't set RequestLogImpl to use a logback-access.xml file via a classpath path
by Marshall Pierce (JIRA) 01 Nov '11

01 Nov '11

Can't set RequestLogImpl to use a logback-access.xml file via a classpath path ------------------------------------------------------------------------------ Key: LBACCESS-26 URL: http://jira.qos.ch/browse/LBACCESS-26 Project: logback-access Issue Type: Bug Affects Versions: 0.9.28 Reporter: Marshall Pierce Assignee: Logback dev list (Affects 0.9.30, the latest version at the moment) ch.qos.logback.access.jetty.v7.RequestLogImpl has setFileName, the result of which is then handed to File's constructor. This is fine when you're deploying inside a standalone jetty that has the jetty.home property set to a filesystem path, but when you're using embedded jetty, you don't have any of that. Instead I'd like to be able to have it find "/logback-access.xml" in the classpath just the way logback classic does with "/logback.xml". I'm happy to implement the patch; just let me know how you'd like it to be done. One way would be to provide a setter on RLImpl that takes a URL which, if specified, takes precedence over the filename. As a workaround I'm creating a JoranConfigurator and using its doConfigure(URL) method on a URL loaded from the classpath. This works, but it'd be nice to not have to do that. -- 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 7

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.0-6-gd101cc0
by git-noreply＠pixie.qos.ch 01 Nov '11

01 Nov '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 d101cc04bde5ec993119697eca1890e5eb228b83 (commit) from 59e0cc914b973679bdba216a08b8cb0e42dbd406 (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=d101cc04bde5ec993119697e… http://github.com/ceki/logback/commit/d101cc04bde5ec993119697eca1890e5eb228… commit d101cc04bde5ec993119697eca1890e5eb228b83 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 1 22:53:13 2011 +0100 document LBACCESS-26 diff --git a/logback-site/src/site/pages/access.html b/logback-site/src/site/pages/access.html index 3e722d7..6e69f22 100644 --- a/logback-site/src/site/pages/access.html +++ b/logback-site/src/site/pages/access.html @@ -63,17 +63,6 @@ version 0.9.30 is Tomcat 6.x. -  - <h2>LogbackValve</h2> The <a @@ -252,6 +241,20 @@ </Set> </Ref></pre> + For embedded Jetty, it is helpful to lookup for the + logback-access configuration file as a class path resource. This + can be accomplished by setting the resource property to + the file name to look up on the class path. + + + <pre class="prettyprint source"><Ref id="RequestLogHandler"> + <Set name="requestLog"> + <New id="requestLogImpl" class="ch.qos.logback.access.jetty.RequestLogImpl"> + <Set name="resource">as/classpath/resource/myaccess.xml</Set> + </New> + </Set> +</Ref></pre> + <h1><a name="configuration" href="#configuration">Logback-access configuration</a></h1> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index a9c9e77..91ec85f 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -26,6 +26,18 @@ the <a href="http://www.qos.ch/mailman/listinfo/announce">QOS.ch announce</a> mailing list. + + <hr width="80%" align="center" /> + + <h3>xx of November, 2011 - Release of version 1.0.1</h3> + + <code>RequestLogImpl</code> can now lookup for the + logback-access configuration file as a class path resource. This + feature was requested in <a + href="http://jira.qos.ch/browse/LBACCESS-26">LBACCESS-26</a> by + Marshall Pierce. + + <hr width="80%" align="center" /> <h3>1st of November, 2011 - Release of version 1.0.0</h3> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/access.html | 25 ++++++++++++++----------- logback-site/src/site/pages/news.html | 12 ++++++++++++ 2 files changed, 26 insertions(+), 11 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_1.0.0-5-g59e0cc9
by git-noreply＠pixie.qos.ch 01 Nov '11

01 Nov '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 59e0cc914b973679bdba216a08b8cb0e42dbd406 (commit) from eeca3cce56c62bbda54d227e64ada15192e5fc27 (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=59e0cc914b973679bdba216a… http://github.com/ceki/logback/commit/59e0cc914b973679bdba216a08b8cb0e42dbd… commit 59e0cc914b973679bdba216a08b8cb0e42dbd406 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 1 22:19:54 2011 +0100 added setter for 'resource' 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 6066b4d..c2bb971 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 @@ -146,9 +146,6 @@ public class RequestLogImpl extends ContextBase implements RequestLog, getStatusManager().add(new InfoStatus(msg, this)); } -// private void addWarn(String msg) { -// getStatusManager().add(new WarnStatus(msg, this)); -// } private void addError(String msg) { getStatusManager().add(new ErrorStatus(msg, this)); } @@ -219,6 +216,10 @@ public class RequestLogImpl extends ContextBase implements RequestLog, this.fileName = fileName; } + public void setResource(String resource) { + this.resource = resource; + } + public boolean isStarted() { return started; } ----------------------------------------------------------------------- Summary of changes: .../qos/logback/access/jetty/RequestLogImpl.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 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_1.0.0-4-geeca3cc
by git-noreply＠pixie.qos.ch 01 Nov '11

01 Nov '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 eeca3cce56c62bbda54d227e64ada15192e5fc27 (commit) via 92857cb9465756d8150091e5cefd64cde7a8b643 (commit) from 23f5ce557103d5e0c202d4e2cbd2172ce12a78d9 (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=eeca3cce56c62bbda54d227e… http://github.com/ceki/logback/commit/eeca3cce56c62bbda54d227e64ada15192e5f… commit eeca3cce56c62bbda54d227e64ada15192e5fc27 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 1 22:02:37 2011 +0100 fixing LBACCESS-26 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 9071b03..6066b4d 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 @@ -14,10 +14,15 @@ package ch.qos.logback.access.jetty; import java.io.File; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import ch.qos.logback.core.status.InfoStatus; +import ch.qos.logback.core.util.FileUtil; import ch.qos.logback.core.util.StatusPrinter; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.RequestLog; @@ -118,6 +123,7 @@ public class RequestLogImpl extends ContextBase implements RequestLog, AppenderAttachableImpl<IAccessEvent> aai = new AppenderAttachableImpl<IAccessEvent>(); FilterAttachableImpl<IAccessEvent> fai = new FilterAttachableImpl<IAccessEvent>(); String fileName; + String resource; boolean started = false; boolean quiet = false; @@ -136,26 +142,23 @@ public class RequestLogImpl extends ContextBase implements RequestLog, aai.appendLoopOnAppenders(accessEvent); } + private void addInfo(String msg) { + getStatusManager().add(new InfoStatus(msg, this)); + } + +// private void addWarn(String msg) { +// getStatusManager().add(new WarnStatus(msg, this)); +// } + private void addError(String msg) { + getStatusManager().add(new ErrorStatus(msg, this)); + } + public void start() { - if (fileName == null) { - String jettyHomeProperty = OptionHelper.getSystemProperty("jetty.home"); - if (OptionHelper.isEmpty(jettyHomeProperty)) { - getStatusManager().add( - 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); + URL configURL = getConfigurationFileURL(); + if (configURL != null) { + runJoranOnFile(configURL); } else { - getStatusManager().add( - new ErrorStatus("Could not find logback-access configuration file [" + fileName + "]", this)); + addError("Could not find configuration file for logback-access"); } if (!isQuiet()) { StatusPrinter.print(getStatusManager()); @@ -163,11 +166,38 @@ public class RequestLogImpl extends ContextBase implements RequestLog, started = true; } - private void runJoranOnFile(File configFile) { + URL getConfigurationFileURL() { + if (fileName != null) { + addInfo("Will use configuration file [" + fileName + "]"); + File file = new File(fileName); + if (!file.exists()) + return null; + return FileUtil.fileToURL(file); + } + if (resource != null) { + addInfo("Will use configuration resource [" + resource + "]"); + return this.getClass().getResource(resource); + } + + String jettyHomeProperty = OptionHelper.getSystemProperty("jetty.home"); + String defaultConfigFile = DEFAULT_CONFIG_FILE; + if (!OptionHelper.isEmpty(jettyHomeProperty)) { + defaultConfigFile = jettyHomeProperty + File.separatorChar + DEFAULT_CONFIG_FILE; + } else { + addInfo("[jetty.home] system property not set."); + } + File file = new File(defaultConfigFile); + addInfo("Assuming default configuration file ["+defaultConfigFile+"]"); + if (!file.exists()) + return null; + return FileUtil.fileToURL(file); + } + + private void runJoranOnFile(URL configURL) { try { JoranConfigurator jc = new JoranConfigurator(); jc.setContext(this); - jc.doConfigure(configFile); + jc.doConfigure(configURL); if (getName() == null) { setName("LogbackRequestLog"); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/FileUtil.java b/logback-core/src/main/java/ch/qos/logback/core/util/FileUtil.java index ee8d4d5..05bc439 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/util/FileUtil.java +++ b/logback-core/src/main/java/ch/qos/logback/core/util/FileUtil.java @@ -19,12 +19,21 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; public class FileUtil { + public static URL fileToURL(File file) { + try { + return file.toURI().toURL(); + } catch (MalformedURLException e) { + throw new RuntimeException("Unexpected exception on file ["+file+"]", e); + } + } + static public boolean isParentDirectoryCreationRequired(File file) { File parent = file.getParentFile(); if (parent != null && !parent.exists()) { http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=92857cb9465756d8150091e5… http://github.com/ceki/logback/commit/92857cb9465756d8150091e5cefd64cde7a8b… commit 92857cb9465756d8150091e5cefd64cde7a8b643 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 1 20:41:50 2011 +0100 no ned for the jetty/v7 folder diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/JettyServerAdapter.java b/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/JettyServerAdapter.java deleted file mode 100644 index b3813d8..0000000 --- a/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/JettyServerAdapter.java +++ /dev/null @@ -1,64 +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.v7; - -import ch.qos.logback.access.spi.ServerAdapter; -import org.eclipse.jetty.http.HttpFields; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.Response; - -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Map; - -/** - * A jetty specific implementation of the {@link ch.qos.logback.access.spi.ServerAdapter} interface. - * - * Note that this implementation works with Jetty version 7.x.x. - * For Jetty 6.x.x implementations, see {@link ch.qos.logback.access.jetty.JettyServerAdapter}. - * - * @author Sébastien Pennec - * @author Ceki Gulcu - */ -public class JettyServerAdapter implements ServerAdapter { - - Request request; - Response response; - - public JettyServerAdapter(Request jettyRequest, Response jettyResponse) { - this.request = jettyRequest; - this.response = jettyResponse; - } - - public long getContentLength() { - return response.getContentCount(); - } - - public int getStatusCode() { - return response.getStatus(); - } - - public Map<String, String> buildResponseHeaderMap() { - Map<String, String> responseHeaderMap = new HashMap<String, String>(); - HttpFields httpFields = response.getHttpFields(); - Enumeration e = httpFields.getFieldNames(); - while (e.hasMoreElements()) { - String key = (String) e.nextElement(); - String value = response.getHeader(key); - responseHeaderMap.put(key, value); - } - return responseHeaderMap; - } - -} \ No newline at end of file diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/RequestLogImpl.java b/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/RequestLogImpl.java deleted file mode 100644 index 91d82c9..0000000 --- a/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/RequestLogImpl.java +++ /dev/null @@ -1,253 +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.v7; - -import ch.qos.logback.access.joran.JoranConfigurator; -import ch.qos.logback.access.spi.AccessEvent; -import ch.qos.logback.access.spi.IAccessEvent; -import ch.qos.logback.core.Appender; -import ch.qos.logback.core.ContextBase; -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.*; -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.server.Request; -import org.eclipse.jetty.server.RequestLog; -import org.eclipse.jetty.server.Response; - -import java.io.File; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - -/** - * This class is logback's implementation of jetty's RequestLog interface. - * - * Note that this implementation works with Jetty version 7.x.x. - * For Jetty 6.x.x implementations, see {@link ch.qos.logback.access.jetty.RequestLogImpl}. - * - * This class can be seen as logback classic's LoggerContext. Appenders can be attached - * directly to RequestLogImpl and RequestLogImpl uses the same StatusManager as - * 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"> - * <New id="requestLogImpl" class="ch.qos.logback.access.jetty.v7.RequestLogImpl"></New> - * </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 - * different than the usual logback classic configuration file. Most of it is - * the same: Appenders and Layouts are declared the exact same way. However, - * 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"> - * <New id="requestLogImpl" class="ch.qos.logback.access.jetty.v7.RequestLogImpl"></New> - * <Set name="fileName">path/to/logback.xml</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"> - * <param name="Pattern" value="%date %server %remoteIP %clientHost %user %requestURL" /> - * </layout> - * </appender> - * - * <appender-ref ref="STDOUT" /> - * </configuration> - * </pre> - * - * Another configuration file, using SMTPAppender, could be: - * - * <pre> - * <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" /> - * </layout> - * <param name="From" value="sender(a)domaine.org" /> - * <param name="SMTPHost" value="mail.domain.org" /> - * <param name="Subject" value="Last Event: %statusCode %requestURL" /> - * <param name="To" value="server_admin(a)domain.org" /> - * </appender> - * <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> { - - public final static String DEFAULT_CONFIG_FILE = "etc" + File.separatorChar + "logback-access.xml"; - - AppenderAttachableImpl<IAccessEvent> aai = new AppenderAttachableImpl<IAccessEvent>(); - FilterAttachableImpl<IAccessEvent> fai = new FilterAttachableImpl<IAccessEvent>(); - String filename; - boolean started = false; - - public RequestLogImpl() { - putObject(CoreConstants.EVALUATOR_MAP, new HashMap()); - } - - public void log(Request jettyRequest, Response jettyResponse) { - JettyServerAdapter adapter = new JettyServerAdapter(jettyRequest, jettyResponse); - IAccessEvent accessEvent = new AccessEvent(jettyRequest, jettyResponse, adapter); - if (getFilterChainDecision(accessEvent) == FilterReply.DENY) { - return; - } - aai.appendLoopOnAppenders(accessEvent); - } - - public void start() { - 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 { - getStatusManager().add(new ErrorStatus("[" + filename + "] does not exist", this)); - } - - 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 - } - } - - public void stop() { - aai.detachAndStopAllAppenders(); - started = false; - } - - public boolean isRunning() { - return started; - } - - public void setFileName(String filename) { - this.filename = filename; - } - - public boolean isStarted() { - return started; - } - - public boolean isStarting() { - return false; - } - - public boolean isStopping() { - return false; - } - - public boolean isStopped() { - return !started; - } - - public boolean isFailed() { - return false; - } - - public void addLifeCycleListener(Listener listener) { - //no support for listeners yet - } - - public void removeLifeCycleListener(Listener listener) { - //no support for listeners yet - } - - public void addAppender(Appender<IAccessEvent> newAppender) { - aai.addAppender(newAppender); - } - - public Iterator<Appender<IAccessEvent>> iteratorForAppenders() { - return aai.iteratorForAppenders(); - } - - public Appender<IAccessEvent> getAppender(String name) { - return aai.getAppender(name); - } - - public boolean isAttached(Appender<IAccessEvent> appender) { - return aai.isAttached(appender); - } - - public void detachAndStopAllAppenders() { - aai.detachAndStopAllAppenders(); - - } - - public boolean detachAppender(Appender<IAccessEvent> appender) { - return aai.detachAppender(appender); - } - - public boolean detachAppender(String name) { - return aai.detachAppender(name); - } - - public void addFilter(Filter<IAccessEvent> newFilter) { - fai.addFilter(newFilter); - } - - public void clearAllFilters() { - fai.clearAllFilters(); - } - - public List<Filter<IAccessEvent>> getCopyOfAttachedFiltersList() { - return fai.getCopyOfAttachedFiltersList(); - } - - public FilterReply getFilterChainDecision(IAccessEvent event) { - return fai.getFilterChainDecision(event); - } -} diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/RequestLogRegistry.java b/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/RequestLogRegistry.java deleted file mode 100644 index 91d299a..0000000 --- a/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/RequestLogRegistry.java +++ /dev/null @@ -1,39 +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.v7; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author Sébastien Pennec - * @author Ceki Gulcu - * - * - * Note that this implementation works with Jetty version 7.x.x. - * For Jetty 6.x.x implementations, see {@link ch.qos.logback.access.jetty.RequestLogRegistry}. - */ -public class RequestLogRegistry { - - private static Map<String, RequestLogImpl> requestLogRegistry = new HashMap<String, RequestLogImpl>(); - - public static void register(RequestLogImpl requestLogImpl) { - requestLogRegistry.put(requestLogImpl.getName(), requestLogImpl); - } - - public static RequestLogImpl get(String key) { - return requestLogRegistry.get(key); - } - -} \ No newline at end of file diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/package.html b/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/package.html deleted file mode 100644 index 2931400..0000000 --- a/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/package.html +++ /dev/null @@ -1,13 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> - -<html> - <head> - <title></title> - </head> - - <body> - - This is logback access' implementation for Jetty version 7 and later. - - </body> -</html> \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: .../qos/logback/access/jetty/RequestLogImpl.java | 70 ++++-- .../access/jetty/v7/JettyServerAdapter.java | 64 ----- .../logback/access/jetty/v7/RequestLogImpl.java | 253 -------------------- .../access/jetty/v7/RequestLogRegistry.java | 39 --- .../ch/qos/logback/access/jetty/v7/package.html | 13 - .../java/ch/qos/logback/core/util/FileUtil.java | 9 + 6 files changed, 59 insertions(+), 389 deletions(-) delete mode 100644 logback-access/src/main/java/ch/qos/logback/access/jetty/v7/JettyServerAdapter.java delete mode 100644 logback-access/src/main/java/ch/qos/logback/access/jetty/v7/RequestLogImpl.java delete mode 100644 logback-access/src/main/java/ch/qos/logback/access/jetty/v7/RequestLogRegistry.java delete mode 100644 logback-access/src/main/java/ch/qos/logback/access/jetty/v7/package.html hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

Properties in logger name
by Eric Charlton 01 Nov '11

01 Nov '11

Hello, In AppenderAction, there is a line: String appenderName = ec.subst(attributes.getValue(NAME_ATTRIBUTE)); In LoggerAction, this is the equivalent: String loggerName = attributes.getValue(NAME_ATTRIBUTE); The LoggerAction doesn't substitute from context. My guess is that there is a good reason why properties are not substituted in logger names....? That's my question. Here's where this comes from: I thought it would be nifty to route some logs via a shared properties file (shared between the app and logback.xml config) like so: <property resource="logbackProps.properties" /> <logger name="${customLoggerName}> <------------this is what doesn't work because LoggerAction doesn't substitute properties <appender-ref ref="SOME_FILE_APPENDER" /> </logger> Then put a logger name in the logbackProps.properties file: customLoggerName=userAuthLogger Then in code (let's say a user authentication DAO) I could: private static Logger authenticationlogger = LoggerFactory.getLogger(ClassThatGetsProperties.getPropertyValueFor(ConstantsEnum.customLoggerName)); Thanks and Cheers! Eric C

2 2