- logback-dev - mailman3.qos.ch

[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

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.0-2-g23f5ce5
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 23f5ce557103d5e0c202d4e2cbd2172ce12a78d9 (commit) from 501e5108e1de32d0cb6df6d8ae9fc0f9fb3e424a (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=23f5ce557103d5e0c202d4e2… http://github.com/ceki/logback/commit/23f5ce557103d5e0c202d4e2cbd2172ce12a7… commit 23f5ce557103d5e0c202d4e2cbd2172ce12a78d9 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 1 19:25:18 2011 +0100 typo fix diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index a2c5711..a9c9e77 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -48,7 +48,7 @@ on properties</a>. </div> - Environment variables are now look up during property + Environment variables are now looked up during property substitution. This feature was requested in <a href="http://jira.qos.ch/browse/LBCORE-212">LBCORE-212</a> by Alexandre Garnier. ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/news.html | 2 +- 1 files changed, 1 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 master updated. v_1.0.0-1-g501e510
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 501e5108e1de32d0cb6df6d8ae9fc0f9fb3e424a (commit) via 8febc7afcb01cbbae98b4cbad6c44e913b22076a (commit) from a7323fa988ff2b26229ad3f4bef10968238ff991 (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=501e5108e1de32d0cb6df6d8… http://github.com/ceki/logback/commit/501e5108e1de32d0cb6df6d8ae9fc0f9fb3e4… commit 501e5108e1de32d0cb6df6d8ae9fc0f9fb3e424a Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 1 18:49:31 2011 +0100 things go on diff --git a/logback-access/pom.xml b/logback-access/pom.xml index 23d2651..fdd3d5a 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> </parent> <artifactId>logback-access</artifactId> diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 690f888..0d67770 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> </parent> <artifactId>logback-classic</artifactId> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index a47aed8..4efc958 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> </parent> <artifactId>logback-core</artifactId> diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index 5373ae9..862d0e7 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index c65ea10..f5e5934 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index 39eed9f..f72f1e0 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Logback-Parent</name> http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=8febc7afcb01cbbae98b4cba… http://github.com/ceki/logback/commit/8febc7afcb01cbbae98b4cbad6c44e913b220… commit 8febc7afcb01cbbae98b4cbad6c44e913b22076a Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 1 18:09:50 2011 +0100 preparing release 1.0 diff --git a/logback-access/pom.xml b/logback-access/pom.xml index f875b36..23d2651 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <artifactId>logback-access</artifactId> diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 17a772f..690f888 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <artifactId>logback-classic</artifactId> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index e56646c..a47aed8 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <artifactId>logback-core</artifactId> diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index 1a18530..5373ae9 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index e5f5cac..c65ea10 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 452d37f..a2c5711 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -28,7 +28,7 @@ <hr width="80%" align="center" /> - <h3>October 17th, 2011 - Release of version 1.0.0</h3> + <h3>1st of November, 2011 - Release of version 1.0.0</h3> The logback-access module now targets Tomcat 7.x and Jetty 7.x & 8.x as its servlet container platforms. This fixes <a diff --git a/pom.xml b/pom.xml index bb62aa1..39eed9f 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> <packaging>pom</packaging> <name>Logback-Parent</name> ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 2 +- logback-classic/pom.xml | 2 +- logback-core/pom.xml | 2 +- logback-examples/pom.xml | 2 +- logback-site/pom.xml | 2 +- logback-site/src/site/pages/news.html | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 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. annotated tag v_1.0.0 created. v_1.0.0
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 annotated tag, v_1.0.0 has been created at eb5f0cbfbaa1131797ca55cbae098ce8a9ac218c (tag) tagging 8febc7afcb01cbbae98b4cbad6c44e913b22076a (commit) replaces v_0.9.30 tagged by Ceki Gulcu on Tue Nov 1 18:48:20 2011 +0100 - Log ----------------------------------------------------------------- tagging as 1.0.0 Ceki Gulcu (60): starting work on 0.9.31 fix LBCORE-222 (a typo) - upgrade to Jetty 7 and Tomcat 7 minro refactoring, cosmetic changes shorter author tag - Add test case output lock/unlocks operations on the console remove unused import AppenderAttachableImpl now uses CopyOnWriteArrayList instead of ReadWriteLock - Merge changes from lbcore224 branch. Essentially - remove dependency on non-released zoookeeper 3.4.0 blurb on lbcore-224 - added link to Tomasz blog entry on root first exception printing minor edits The logback-access module now targets Tomcat 7.x and Jetty 7.x & 8.x as its servlet container platforms. LBACCESS-25 fix LBCORE-218 fix LBCLASSIC-283 minor edits fixing LBCORE-225 fixing LBCORE-225 added link to ohloh widget Merge pull request #30 from imaikazuki/master properties now have scope. Fixed LBCORE-212 next release will be 1.0.0 ongoing clean up for maven 3 maven 3 compliance added missing test resource removed deprecated scm data minor edit add missing error code for appender definition/reference ordering add link to perf4j added link to logback-audit, other minor edits fix LBCLASSIC-131 pom.xml cleanup, minor edits in news.html fix LBACCESS-27 Context now offers an execution service make FileAppenderResilienceTest less picky make scan1 test in JoranConfiguratorTest more robust make ReconfigureOnChangeTest more robust indentation changes only taking into account that a reset can occur while the harness thread is sleeping upgrade to surefire 2.10, fix ContextDetachingSCLTest ongoing work minor changes to make the build always successful make port collisions less likely remove fragile Perf tests blurb about building logback with Eclipse and IDEA indentation changes only make site plugin work, editorial cleanup conditional configuration now supports all property scopes make tests pass, doc uptates, upgrade to Groovy 1.8.3 revert groovy 1.7.6, revert to gmaven instead of groovy-eclipse compiler remove cruft from eclipse plugin added instructions for building under Eclipse editing removing unused imports added timeOfLastReset method to StatusChecker upgrade to slf4j 1.6.4, sync wagon-ssh version with that expected by site-plugin preparing release 1.0 IMAI Kazuki (1): Fix typo. Pierre Queinnec (5): Remove two infinite loops in AccessConverter#addError methods. Add a missing break in the switch statement responsible for choosing the SQL dialect. Fix the javadoc for the H2 dialect to distinguish from the HSQLDB one. Add a builder for LoggingEventVO objects. Fix the exception occuring because LoggingEvent is not serializable by using LoggingEventVO instances for the benchmark. ----------------------------------------------------------------------- hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

Release of logback version 1.0.0
by ceki 01 Nov '11

01 Nov '11

Hello all, After only 6 years of gestation, I am happy to announce the release of logback version 1.0.0. It should hit the Maven central repository within the next 24 hours. There are no big changes in this release. None. No spectacular new features, no breakages. There are bug fixes and small enhancements but nothing earth shattering. The version number is bumped to 1.0.0 but otherwise things remain the same. Please refer to the news page for precise details of this release. http://logback.qos.ch/news.html You can download logback, including full source code, class files and documentation on our download page, shown below. http://logback.qos.ch/download.html You can receive logback related announcements by subscribing to the QOS.ch announce mailing list. To subscribe to QOS.ch announce list, please visit the following URL. http://www.qos.ch/mailman/listinfo/announce Enjoy, -- Ceki http://twitter.com/#!/ceki

1 0

birthTime of the context
by ceki 01 Nov '11

01 Nov '11

Hi Joern, > Could you reset the birthTime of the Context as I requested in > LBCLASSIC-273? Please? :) The birth time of the context designates the start time of the application (assuming logback was started at application launch). I don't think it makes sense to reset the birth time when the context is reset. For example, relative time would go backwards if birth time was reset which users may find confusing. -- Ceki http://twitter.com/#!/ceki

2 5

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-65-ga7323fa
by git-noreply＠pixie.qos.ch 31 Oct '11

31 Oct '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 a7323fa988ff2b26229ad3f4bef10968238ff991 (commit) from f28496ad3e5c631876c5e777c1bb54df88969476 (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=a7323fa988ff2b26229ad3f4… http://github.com/ceki/logback/commit/a7323fa988ff2b26229ad3f4bef10968238ff… commit a7323fa988ff2b26229ad3f4bef10968238ff991 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 1 00:07:32 2011 +0100 upgrade to slf4j 1.6.4, sync wagon-ssh version with that expected by site-plugin diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java b/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java index b045016..c41673c 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java @@ -103,8 +103,6 @@ public final class LogbackMDCAdapter implements MDCAdapter { } Map<String, String> oldMap = copyOnInheritThreadLocal.get(); - //System.out.println(Thread.currentThread().toString()+", "+oldMap); - Integer lastOp = getAndSetLastOperation(WRITE_OPERATION); if (wasLastOpReadOrNull(lastOp) || oldMap == null) { diff --git a/pom.xml b/pom.xml index 8565a3b..bb62aa1 100755 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>  - <slf4j.version>1.6.3</slf4j.version> + <slf4j.version>1.6.4</slf4j.version> <junit.version>4.8.2</junit.version> <janino.version>2.5.10</janino.version> <scala.version>2.9.1</scala.version> @@ -176,7 +176,7 @@ <extension> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh</artifactId> - <version>1.0-beta-1</version> + <version>2.0</version> </extension> </extensions> ----------------------------------------------------------------------- Summary of changes: .../logback/classic/util/LogbackMDCAdapter.java | 2 -- pom.xml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

Build seems to be fixed.
by Joern Huxhorn 31 Oct '11

31 Oct '11

Hi Ceki, just wanted to let you know that it appears like you really fixed the build/tests now. No random build failures on our systems anymore, thumbs up. Cheers, Joern.

2 5

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-64-gf28496a
by git-noreply＠pixie.qos.ch 31 Oct '11

31 Oct '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 f28496ad3e5c631876c5e777c1bb54df88969476 (commit) from 1b3439a5868d50b8423f675e15dc8db9a35b7102 (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=f28496ad3e5c631876c5e777… http://github.com/ceki/logback/commit/f28496ad3e5c631876c5e777c1bb54df88969… commit f28496ad3e5c631876c5e777c1bb54df88969476 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Oct 31 21:41:19 2011 +0100 added timeOfLastReset method to StatusChecker diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java b/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java index 19f8aa1..9d78f8e 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java @@ -19,6 +19,7 @@ import java.util.List; import ch.qos.logback.classic.gaffer.GafferUtil; import ch.qos.logback.classic.util.EnvUtil; +import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.joran.event.SaxEvent; import ch.qos.logback.core.joran.spi.ConfigurationWatchList; import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil; @@ -39,9 +40,6 @@ import ch.qos.logback.core.spi.FilterReply; */ public class ReconfigureOnChangeFilter extends TurboFilter { - final static long INIT = System.currentTimeMillis(); - final static long SENTINEL = Long.MAX_VALUE; - /** * Scan for changes in configuration file once every minute. */ @@ -153,7 +151,7 @@ public class ReconfigureOnChangeFilter extends TurboFilter { return; } LoggerContext lc = (LoggerContext) context; - addInfo("Will reset and reconfigure context named [" + context.getName() + "]"); + addInfo(CoreConstants.RESET_MSG_PREFIX + "named ["+context.getName() + "]"); if (mainConfigurationURL.toString().endsWith("xml")) { performXMLConfiguration(lc); } else if (mainConfigurationURL.toString().endsWith("groovy")) { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java index b4c1e74..22db069 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java @@ -19,6 +19,7 @@ import java.util.concurrent.TimeUnit; import java.util.logging.LogManager; import ch.qos.logback.classic.jul.JULHelper; +import ch.qos.logback.classic.turbo.ReconfigureOnChangeFilter; import ch.qos.logback.core.pattern.parser.Parser; import ch.qos.logback.core.pattern.parser.ScanException; import ch.qos.logback.core.status.Status; @@ -308,7 +309,7 @@ public class JoranConfiguratorTest { //StatusPrinter.print(loggerContext); StatusChecker checker = new StatusChecker(loggerContext); assertTrue(checker.isErrorFree(0)); - assertTrue(checker.containsMatch("Will reset and reconfigure context")); + assertTrue(checker.containsMatch(CoreConstants.RESET_MSG_PREFIX)); } @Test diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java index 3884672..d451b1b 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java @@ -260,7 +260,7 @@ public class ReconfigureOnChangeTest { } int effectiveResets = checker - .matchCount("Will reset and reconfigure context"); + .matchCount(CoreConstants.RESET_MSG_PREFIX); String failMsg = "effective=" + effectiveResets + ", expected=" + expected; diff --git a/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java b/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java index fcb642f..55fb8e4 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java +++ b/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java @@ -82,7 +82,6 @@ public class CoreConstants { public static final char DOUBLE_QUOTE_CHAR = '"'; public static final char SINGLE_QUOTE_CHAR = '\''; - /** * Number of rows before in an HTML table before, * we close the table and create a new one @@ -140,4 +139,6 @@ public class CoreConstants { public static final int MILLIS_IN_ONE_WEEK = MILLIS_IN_ONE_DAY*7; public static final String CONTEXT_SCOPE_VALUE = "context"; + + final public static String RESET_MSG_PREFIX = "Will reset and reconfigure context "; } diff --git a/logback-core/src/main/java/ch/qos/logback/core/status/StatusChecker.java b/logback-core/src/main/java/ch/qos/logback/core/status/StatusChecker.java index d9e3d2c..ae61c74 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/status/StatusChecker.java +++ b/logback-core/src/main/java/ch/qos/logback/core/status/StatusChecker.java @@ -116,4 +116,22 @@ public class StatusChecker { return false; } + /** + * Return the time of last reset. -1 if last reset time could not be found + * @return time of last reset or -1 + */ + public long timeOfLastReset() { + List<Status> statusList = sm.getCopyOfStatusList(); + if(statusList == null) + return -1; + + int len = statusList.size(); + for(int i = len-1; i >= 0; i--) { + Status s = statusList.get(i); + if(CoreConstants.RESET_MSG_PREFIX.equals(s.getMessage())) { + return s.getDate(); + } + } + return -1; + } } diff --git a/logback-core/src/test/java/ch/qos/logback/core/status/StatusCheckerTest.java b/logback-core/src/test/java/ch/qos/logback/core/status/StatusCheckerTest.java new file mode 100644 index 0000000..695edb2 --- /dev/null +++ b/logback-core/src/test/java/ch/qos/logback/core/status/StatusCheckerTest.java @@ -0,0 +1,40 @@ +package ch.qos.logback.core.status; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.CoreConstants; +import org.junit.Test; + +import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +/** + * @author Ceki Gücü + */ +public class StatusCheckerTest { + + Context context = new ContextBase(); + StatusChecker checker = new StatusChecker(context); + + @Test + public void emptyStatusListShouldResultInNotFound() { + assertEquals(-1, checker.timeOfLastReset()); + } + + @Test + public void withoutResetsCheckerShouldReturnNotFound() { + context.getStatusManager().add(new InfoStatus("test", this)); + assertEquals(-1, checker.timeOfLastReset()); + } + + @Test + public void statusListShouldReturnLastResetTime() { + context.getStatusManager().add(new InfoStatus("test", this)); + long resetTime = System.currentTimeMillis(); + context.getStatusManager().add(new InfoStatus(CoreConstants.RESET_MSG_PREFIX, this)); + context.getStatusManager().add(new InfoStatus("bla", this)); + assertTrue(resetTime <= checker.timeOfLastReset()); + } + + +} ----------------------------------------------------------------------- Summary of changes: .../classic/turbo/ReconfigureOnChangeFilter.java | 6 +-- .../classic/joran/JoranConfiguratorTest.java | 3 +- .../classic/turbo/ReconfigureOnChangeTest.java | 2 +- .../java/ch/qos/logback/core/CoreConstants.java | 3 +- .../ch/qos/logback/core/status/StatusChecker.java | 18 +++++++++ .../qos/logback/core/status/StatusCheckerTest.java | 40 ++++++++++++++++++++ 6 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 logback-core/src/test/java/ch/qos/logback/core/status/StatusCheckerTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0