- logback-dev - mailman3.qos.ch

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-59-g176a1a7
by git-noreply＠pixie.qos.ch 03 Mar '10

03 Mar '10

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 176a1a7219de866a69604d8a8e81f8d759858d5e (commit) via 9442a2d5a9fc9e938bee8f4b50d427016b77ec38 (commit) from fc91f4117cfaacbd6deac9fb319a6abe07b45115 (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=176a1a7219de866a69604d8a… http://github.com/ceki/logback/commit/176a1a7219de866a69604d8a8e81f8d759858… commit 176a1a7219de866a69604d8a8e81f8d759858d5e Merge: fc91f41 9442a2d Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Mar 3 23:29:56 2010 +0100 Merge branch 'master' of git://github.com/spennec/logback http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=9442a2d5a9fc9e938bee8f4b… http://github.com/ceki/logback/commit/9442a2d5a9fc9e938bee8f4b50d427016b77e… commit 9442a2d5a9fc9e938bee8f4b50d427016b77ec38 Author: Sebastien Pennec <sebastien(a)qos.ch> Date: Wed Mar 3 22:38:47 2010 +0100 Adding Jetty 7 support diff --git a/logback-access/pom.xml b/logback-access/pom.xml index ffb1d14..4c26e9b 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -63,6 +63,13 @@ </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> + + <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> <scope>compile</scope> 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 new file mode 100644 index 0000000..eb53108 --- /dev/null +++ b/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/JettyServerAdapter.java @@ -0,0 +1,64 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2009, 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. + * <p> + * <strong>Note</strong> 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 new file mode 100644 index 0000000..35bd8ce --- /dev/null +++ b/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/RequestLogImpl.java @@ -0,0 +1,256 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2009, 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.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. <p> + * <p> + * <strong>Note</strong> that this implementation works with Jetty version 7.x.x. + * For Jetty 6.x.x implementations, see {@link ch.qos.logback.access.jetty.RequestLogImpl}. + * <p> + * 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. <p> To + * configure jetty in order to use RequestLogImpl, the following lines must be + * added to the jetty configuration file, namely <em>etc/jetty.xml</em>: + * + * <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 + * <em>etc/logback-access.xml</em>. 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. <p> 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> + * + * <p> 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> + * + * <p> 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<AccessEvent>, FilterAttachable<AccessEvent> { + + public final static String DEFAULT_CONFIG_FILE = "etc" + File.separatorChar + "logback-access.xml"; + + AppenderAttachableImpl<AccessEvent> aai = new AppenderAttachableImpl<AccessEvent>(); + FilterAttachableImpl<AccessEvent> fai = new FilterAttachableImpl<AccessEvent>(); + 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); + AccessEvent 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<AccessEvent> newAppender) { + aai.addAppender(newAppender); + } + + public Iterator<Appender<AccessEvent>> iteratorForAppenders() { + return aai.iteratorForAppenders(); + } + + public Appender<AccessEvent> getAppender(String name) { + return aai.getAppender(name); + } + + public boolean isAttached(Appender<AccessEvent> appender) { + return aai.isAttached(appender); + } + + public void detachAndStopAllAppenders() { + aai.detachAndStopAllAppenders(); + + } + + public boolean detachAppender(Appender<AccessEvent> appender) { + return aai.detachAppender(appender); + } + + public boolean detachAppender(String name) { + return aai.detachAppender(name); + } + + public void addFilter(Filter<AccessEvent> newFilter) { + fai.addFilter(newFilter); + } + + public void clearAllFilters() { + fai.clearAllFilters(); + } + + public List<Filter<AccessEvent>> getCopyOfAttachedFiltersList() { + return fai.getCopyOfAttachedFiltersList(); + } + + public FilterReply getFilterChainDecision(AccessEvent event) { + return fai.getFilterChainDecision(event); + } + + public Filter getFirstFilter() { + return fai.getFirstFilter(); + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..2e3878d --- /dev/null +++ b/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/RequestLogRegistry.java @@ -0,0 +1,39 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2009, 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 + * + * <p> + * <strong>Note</strong> 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 new file mode 100644 index 0000000..2931400 --- /dev/null +++ b/logback-access/src/main/java/ch/qos/logback/access/jetty/v7/package.html @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + <p>This is logback access' implementation for Jetty version 7 and later.</p> + + </body> +</html> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2af4ff3..c2ff239 100755 --- a/pom.xml +++ b/pom.xml @@ -104,6 +104,11 @@ <version>6.1.1</version> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>7.0.1.v20091125</version> + </dependency> + <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> <version>6.1.1</version> ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 7 ++ .../access/jetty/{ => v7}/JettyServerAdapter.java | 26 +++-- .../access/jetty/{ => v7}/RequestLogImpl.java | 112 ++++++++++---------- .../access/jetty/{ => v7}/RequestLogRegistry.java | 18 +++- .../qos/logback/access/{ => jetty/v7}/package.html | 2 +- pom.xml | 5 + 6 files changed, 97 insertions(+), 73 deletions(-) copy logback-access/src/main/java/ch/qos/logback/access/jetty/{ => v7}/JettyServerAdapter.java (76%) copy logback-access/src/main/java/ch/qos/logback/access/jetty/{ => v7}/RequestLogImpl.java (81%) copy logback-access/src/main/java/ch/qos/logback/access/jetty/{ => v7}/RequestLogRegistry.java (74%) copy logback-access/src/main/java/ch/qos/logback/access/{ => jetty/v7}/package.html (58%) 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. v0.9.18-57-gfc91f41
by git-noreply＠pixie.qos.ch 03 Mar '10

03 Mar '10

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 fc91f4117cfaacbd6deac9fb319a6abe07b45115 (commit) from 63475d86b35850ed5ed1ea735bf2bf38521ebbaf (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=fc91f4117cfaacbd6deac9fb… http://github.com/ceki/logback/commit/fc91f4117cfaacbd6deac9fb319a6abe07b45… commit fc91f4117cfaacbd6deac9fb319a6abe07b45115 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Mar 3 23:24:02 2010 +0100 - more tests and improvements to ResilientFileOutputStream diff --git a/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java b/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java index 46eae83..1dfbb39 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java +++ b/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java @@ -162,7 +162,7 @@ public class FileAppender<E> extends OutputStreamAppender<E> { ResilientFileOutputStream resilientFos = new ResilientFileOutputStream( file, append); - + resilientFos.setContext(context); setOutputStream(resilientFos); } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/net/TelnetAppender.java b/logback-core/src/main/java/ch/qos/logback/core/net/TelnetAppender.java deleted file mode 100644 index a97e000..0000000 --- a/logback-core/src/main/java/ch/qos/logback/core/net/TelnetAppender.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Logback: the reliable, generic, fast and flexible logging framework. - * Copyright (C) 1999-2009, 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.core.net; - -import ch.qos.logback.core.AppenderBase; - -public class TelnetAppender extends AppenderBase { - - int port; - - @Override - public void start() { - int errorCount = 0; - if (port == 0) { - errorCount++; - addError("No port was configured for appender" - + name - + " For more information, please visit http://logback.qos.ch/codes.html#socket_no_port"); - } - - //ServerSocket serverSocket = new ServerSocket(port); - -// connect(address, port); - - if (errorCount == 0) { - this.started = true; - } - } - - @Override - protected void append(Object eventObject) { - // TODO Auto-generated method stub - - } - - - -} diff --git a/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientFileOutputStream.java b/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientFileOutputStream.java index 59839c7..95ad0d2 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientFileOutputStream.java +++ b/logback-core/src/main/java/ch/qos/logback/core/recovery/ResilientFileOutputStream.java @@ -20,12 +20,21 @@ import java.io.IOException; import java.io.OutputStream; import java.nio.channels.FileChannel; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.status.ErrorStatus; +import ch.qos.logback.core.status.InfoStatus; +import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.status.StatusManager; + public class ResilientFileOutputStream extends OutputStream { - RecoveryCoordinator recoveryCoordinator; - boolean bufferedIO; - int bufferSize; + final static int STATUS_COUNT_LIMIT = 2 * 4; + private int noContextWarning = 0; + private int statusCount = 0; + + Context context; + RecoveryCoordinator recoveryCoordinator; FileOutputStream fos; File file; boolean presumedClean = true; @@ -43,67 +52,128 @@ public class ResilientFileOutputStream extends OutputStream { return fos.getChannel(); } - public File getFile() { return file; } - public void write(byte b[], int off, int len) throws IOException { + boolean isPresumedInError() { // existence of recoveryCoordinator indicates failed state - if (recoveryCoordinator != null && !presumedClean) { + return (recoveryCoordinator != null && !presumedClean); + } + + public void write(byte b[], int off, int len) { + if (isPresumedInError()) { if (!recoveryCoordinator.isTooSoon()) { - performRecoveryAttempt(); + attemptRecovery(); } - // we return regardless of the success of the recovery attempt - return; + return; // return regardless of the success of the recovery attempt } try { fos.write(b, off, len); postSuccessfulWrite(); } catch (IOException e) { - presumedClean = false; - recoveryCoordinator = new RecoveryCoordinator(); + postIOFailure(e); } } - private void postSuccessfulWrite() { - recoveryCoordinator = null; - } - @Override - public void close() throws IOException { - if (fos != null) { - fos.close(); - } - } - - @Override - public void write(int b) throws IOException { - // existence of recoveryCoordinator indicates failed state - if (recoveryCoordinator != null) { + public void write(int b) { + if (isPresumedInError()) { if (!recoveryCoordinator.isTooSoon()) { - performRecoveryAttempt(); + attemptRecovery(); } - // we return regardless of the success of the recovery attempt - return; + return; // return regardless of the success of the recovery attempt } try { fos.write(b); postSuccessfulWrite(); } catch (IOException e) { + postIOFailure(e); + } + } + + private void postSuccessfulWrite() { + if (recoveryCoordinator != null) { + recoveryCoordinator = null; + statusCount = 0; + addStatus(new InfoStatus("Recovered from IO failure on file [" + file + + "]", this)); + } + } + + void postIOFailure(IOException e) { + addStatusIfCountNotOverLimit(new ErrorStatus( + "IO failure while writing to [" + file + "]", this, e)); + presumedClean = false; + if (recoveryCoordinator == null) { recoveryCoordinator = new RecoveryCoordinator(); } } - void performRecoveryAttempt() throws FileNotFoundException { + @Override + public void close() throws IOException { + if (fos != null) { + fos.close(); + } + } + + void attemptRecovery() { try { close(); } catch (IOException e) { } + addStatusIfCountNotOverLimit(new InfoStatus( + "Attempting to recover from IO failure on file [" + file + "]", this)); + // subsequent writes must always be in append mode - fos = new FileOutputStream(file, true); - presumedClean = true; + try { + fos = new FileOutputStream(file, true); + presumedClean = true; + } catch (IOException e) { + addStatusIfCountNotOverLimit(new ErrorStatus("Failed to open file [" + + file + "]", this, e)); + } + } + + void addStatusIfCountNotOverLimit(Status s) { + ++statusCount; + if (statusCount < STATUS_COUNT_LIMIT) { + addStatus(s); + } + + if (statusCount == STATUS_COUNT_LIMIT) { + addStatus(s); + addStatus(new InfoStatus("Will supress future messages regarding [" + + file + "]", this)); + } + } + + public void addStatus(Status status) { + if (context == null) { + if (noContextWarning++ == 0) { + System.out.println("LOGBACK: No context given for " + this); + } + return; + } + StatusManager sm = context.getStatusManager(); + if (sm != null) { + sm.add(status); + } + } + + public Context getContext() { + return context; + } + + public void setContext(Context context) { + this.context = context; + } + + @Override + public String toString() { + return "c.q.l.c.recovery.ResilientFileOutputStream@" + + System.identityHashCode(this); } } diff --git a/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilienceTest.java b/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilienceTest.java index e4216c2..5df81f3 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilienceTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilienceTest.java @@ -1,165 +1,100 @@ package ch.qos.logback.core; -import static org.junit.Assert.assertTrue; - -import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; -import java.io.FileReader; import java.io.IOException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import java.nio.channels.FileChannel; -import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; +import ch.qos.logback.core.contention.RunnableWithCounterAndDone; import ch.qos.logback.core.encoder.EchoEncoder; -import ch.qos.logback.core.testUtil.Env; +import ch.qos.logback.core.recovery.ResilientFileOutputStream; +import ch.qos.logback.core.status.OnConsoleStatusListener; import ch.qos.logback.core.testUtil.RandomUtil; -import ch.qos.logback.core.util.StatusPrinter; +import ch.qos.logback.core.util.CoreTestConstants; +import ch.qos.logback.core.util.ResilienceUtil; public class FileAppenderResilienceTest { - static String MOUNT_POINT = "/mnt/loop/"; - - static String LONG_STR = " xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; - - static String PATH_LOOPFS_SCRIPT = "/home/ceki/java/logback/logback-core/src/test/loopfs.sh"; - - - enum LoopFSCommand { - setup, shake, teardown; - } - + FileAppender<Object> fa = new FileAppender<Object>(); Context context = new ContextBase(); int diff = RandomUtil.getPositiveInt(); - String outputDirStr = MOUNT_POINT + "resilience-" + diff + "/"; + String outputDirStr = CoreTestConstants.OUTPUT_DIR_PREFIX + "resilience-" + + diff + "/"; + + //String outputDirStr = "\\\\192.168.1.3\\lbtest\\" + "resilience-"+ diff + "/";; String logfileStr = outputDirStr + "output.log"; - - FileAppender<Object> fa = new FileAppender<Object>(); - static boolean isConformingHost() { - return Env.isLocalHostNameInList(new String[] {"gimmel"}); - } - @Before - public void setUp() throws IOException, InterruptedException { - if(!isConformingHost()) { - return; - } - Process p = runLoopFSScript(LoopFSCommand.setup); - p.waitFor(); - - dump("/tmp/loopfs.log"); + public void setUp() throws InterruptedException { - fa.setContext(context); + context.getStatusManager().add(new OnConsoleStatusListener()); + File outputDir = new File(outputDirStr); outputDir.mkdirs(); - System.out.println("FileAppenderResilienceTest output dir [" + outputDirStr - + "]"); + fa.setContext(context); fa.setName("FILE"); fa.setEncoder(new EchoEncoder<Object>()); fa.setFile(logfileStr); fa.start(); - } - void dump(String file) throws IOException { - FileInputStream fis = null; - try { - fis = new FileInputStream(file); - int r; - while ((r = fis.read()) != -1) { - char c = (char) r; - System.out.print(c); - } - } finally { - if (fis != null) { - fis.close(); - } - } } - - @After - public void tearDown() throws IOException, InterruptedException { - if(!isConformingHost()) { - return; + @Test + @Ignore + public void manual() throws InterruptedException, IOException { + Runner runner = new Runner(fa); + Thread t = new Thread(runner); + t.start(); + + while (true) { + Thread.sleep(110); } - StatusPrinter.print(context); - fa.stop(); - Process p = runLoopFSScript(LoopFSCommand.teardown); - p.waitFor(); - System.out.println("Tearing down"); } - static int TOTAL_DURATION = 5000; - static int NUM_STEPS = 500; - static int DELAY = TOTAL_DURATION / NUM_STEPS; @Test - public void go() throws IOException, InterruptedException { - if(!isConformingHost()) { - return; - } - Process p = runLoopFSScript(LoopFSCommand.shake); - for (int i = 0; i < NUM_STEPS; i++) { - fa.append(String.valueOf(i) + LONG_STR); - Thread.sleep(DELAY); + public void smoke() throws InterruptedException, IOException { + Runner runner = new Runner(fa); + Thread t = new Thread(runner); + t.start(); + + for (int i = 0; i < 10; i++) { + Thread.sleep(100); + ResilientFileOutputStream resilientFOS = (ResilientFileOutputStream) fa + .getOutputStream(); + FileChannel fileChannel = resilientFOS.getChannel(); + fileChannel.close(); } - p.waitFor(); - verify(logfileStr); - System.out.println("Done go"); + runner.setDone(true); + t.join(); + + ResilienceUtil + .verify(logfileStr, "^hello (\\d{1,5})$", runner.getCounter()); } +} - // the loopfs script is tightly coupled with the host machine - // it needs to be Unix, with sudo privileges granted to the script - Process runLoopFSScript(LoopFSCommand cmd) throws IOException, - InterruptedException { - // causing a NullPointerException is better than locking the whole - // machine which the next operation can and will do. - if(!isConformingHost()) { - return null; - } - ProcessBuilder pb = new ProcessBuilder(); - pb.command("/usr/bin/sudo", PATH_LOOPFS_SCRIPT, cmd.toString()); - Process process = pb.start(); - return process; +class Runner extends RunnableWithCounterAndDone { + FileAppender<Object> fa; + + Runner(FileAppender<Object> fa) { + this.fa = fa; } - void verify(String logfile) throws NumberFormatException, IOException { - FileReader fr = new FileReader(logfile); - BufferedReader br = new BufferedReader(fr); - String regExp = "^(\\d{1,3}) x*$"; - Pattern p = Pattern.compile(regExp); - String line; - - int totalLines = 0; - int oldNum = -1; - int gaps = 0; - while ((line = br.readLine()) != null) { - Matcher m = p.matcher(line); - if (m.matches()) { - totalLines++; - String g = m.group(1); - int num = Integer.parseInt(g); - if(num != oldNum+1) { - gaps++; + public void run() { + while (!isDone()) { + counter++; + fa.doAppend("hello " + counter); + if (counter % 1024 == 0) { + try { + Thread.sleep(10); + } catch (InterruptedException e) { } - oldNum = num; } } - fr.close(); - br.close(); - - // at least 40% of the logs should have been written - int lowerLimit = (int) (NUM_STEPS*0.4); - assertTrue("totalLines="+totalLines+" less than "+lowerLimit, totalLines > lowerLimit); - - // we want some gaps which indicate recuperation - assertTrue("gaps="+gaps+" less than 3", gaps > 3); - } -} +} \ No newline at end of file diff --git a/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilienceTest.java b/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilience_AS_ROOT_Test.java similarity index 73% copy from logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilienceTest.java copy to logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilience_AS_ROOT_Test.java index e4216c2..0ed804b 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilienceTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/FileAppenderResilience_AS_ROOT_Test.java @@ -1,14 +1,21 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2010, 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.core; -import static org.junit.Assert.assertTrue; - -import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileReader; import java.io.IOException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.junit.After; import org.junit.Before; @@ -17,9 +24,10 @@ import org.junit.Test; import ch.qos.logback.core.encoder.EchoEncoder; import ch.qos.logback.core.testUtil.Env; import ch.qos.logback.core.testUtil.RandomUtil; +import ch.qos.logback.core.util.ResilienceUtil; import ch.qos.logback.core.util.StatusPrinter; -public class FileAppenderResilienceTest { +public class FileAppenderResilience_AS_ROOT_Test { static String MOUNT_POINT = "/mnt/loop/"; @@ -109,7 +117,7 @@ public class FileAppenderResilienceTest { Thread.sleep(DELAY); } p.waitFor(); - verify(logfileStr); + ResilienceUtil.verify(logfileStr, "^(\\d{1,3}) x*$", NUM_STEPS); System.out.println("Done go"); } @@ -127,39 +135,4 @@ public class FileAppenderResilienceTest { Process process = pb.start(); return process; } - - void verify(String logfile) throws NumberFormatException, IOException { - FileReader fr = new FileReader(logfile); - BufferedReader br = new BufferedReader(fr); - String regExp = "^(\\d{1,3}) x*$"; - Pattern p = Pattern.compile(regExp); - String line; - - int totalLines = 0; - int oldNum = -1; - int gaps = 0; - while ((line = br.readLine()) != null) { - Matcher m = p.matcher(line); - if (m.matches()) { - totalLines++; - String g = m.group(1); - int num = Integer.parseInt(g); - if(num != oldNum+1) { - gaps++; - } - oldNum = num; - } - } - fr.close(); - br.close(); - - // at least 40% of the logs should have been written - int lowerLimit = (int) (NUM_STEPS*0.4); - assertTrue("totalLines="+totalLines+" less than "+lowerLimit, totalLines > lowerLimit); - - // we want some gaps which indicate recuperation - assertTrue("gaps="+gaps+" less than 3", gaps > 3); - - } - } diff --git a/logback-core/src/test/java/ch/qos/logback/core/WriterAppenderTest.java b/logback-core/src/test/java/ch/qos/logback/core/OutputStreamAppenderTest.java similarity index 98% rename from logback-core/src/test/java/ch/qos/logback/core/WriterAppenderTest.java rename to logback-core/src/test/java/ch/qos/logback/core/OutputStreamAppenderTest.java index e5988a7..0d475c8 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/WriterAppenderTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/OutputStreamAppenderTest.java @@ -25,7 +25,7 @@ import org.junit.Test; import ch.qos.logback.core.html.LayoutWrappingEncoder; import ch.qos.logback.core.pattern.parser.SamplePatternLayout; -public class WriterAppenderTest { +public class OutputStreamAppenderTest { Context context = new ContextBase(); diff --git a/logback-core/src/test/java/ch/qos/logback/core/PackageTest.java b/logback-core/src/test/java/ch/qos/logback/core/PackageTest.java index 190f370..e6e17a5 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/PackageTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/PackageTest.java @@ -18,6 +18,6 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( { ContextBaseTest.class, WriterAppenderTest.class }) +@SuiteClasses( { ContextBaseTest.class, OutputStreamAppenderTest.class, FileAppenderResilienceTest.class, FileAppenderResilience_AS_ROOT_Test.class }) public class PackageTest { } diff --git a/logback-core/src/test/java/ch/qos/logback/core/util/ResilienceUtil.java b/logback-core/src/test/java/ch/qos/logback/core/util/ResilienceUtil.java new file mode 100644 index 0000000..2233fbc --- /dev/null +++ b/logback-core/src/test/java/ch/qos/logback/core/util/ResilienceUtil.java @@ -0,0 +1,46 @@ +package ch.qos.logback.core.util; + +import static org.junit.Assert.assertTrue; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class ResilienceUtil { + + + static public void verify(String logfile, String regexp, long totalSteps) throws NumberFormatException, IOException { + FileReader fr = new FileReader(logfile); + BufferedReader br = new BufferedReader(fr); + Pattern p = Pattern.compile(regexp); + String line; + + int totalLines = 0; + int oldNum = -1; + int gaps = 0; + while ((line = br.readLine()) != null) { + Matcher m = p.matcher(line); + if (m.matches()) { + totalLines++; + String g = m.group(1); + int num = Integer.parseInt(g); + if(num != oldNum+1) { + gaps++; + } + oldNum = num; + } + } + fr.close(); + br.close(); + + // at least 40% of the logs should have been written + int lowerLimit = (int) (totalSteps*0.4); + assertTrue("totalLines="+totalLines+" less than "+lowerLimit, totalLines > lowerLimit); + + // we want some gaps which indicate recuperation + assertTrue("gaps="+gaps+" less than 3", gaps > 3); + + } +} diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 964c4dd..2b2c803 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -58,6 +58,16 @@ </div> + <p><code>FileAppender</code> and derived classes can now + gracefully deal with IO failreus and recover quickly after the + original cause of the IO failure is corrected. For example, if the + log file is located on a <a + href="http://en.wikipedia.org/wiki/Network-attached_storage">network-attached + storage (NAS)</a>, and the connection to the NAS server is lost, + <code>FileAppender</code> and derived classes will recover quickly + after the connection to the server is re-established. + </p> + <p>Added <a href="manual/appenders.html#OnMarkerEvaluator">OnMarkerEvaluator</a> which evaluates to true in the presence of user-specified ----------------------------------------------------------------------- Summary of changes: .../java/ch/qos/logback/core/FileAppender.java | 2 +- .../ch/qos/logback/core/net/TelnetAppender.java | 49 ------ .../core/recovery/ResilientFileOutputStream.java | 132 +++++++++++---- .../logback/core/FileAppenderResilienceTest.java | 177 ++++++------------- ...va => FileAppenderResilience_AS_ROOT_Test.java} | 59 ++----- ...nderTest.java => OutputStreamAppenderTest.java} | 2 +- .../test/java/ch/qos/logback/core/PackageTest.java | 2 +- .../ch/qos/logback/core/util/ResilienceUtil.java | 46 +++++ logback-site/src/site/pages/news.html | 10 + 9 files changed, 232 insertions(+), 247 deletions(-) delete mode 100644 logback-core/src/main/java/ch/qos/logback/core/net/TelnetAppender.java copy logback-core/src/test/java/ch/qos/logback/core/{FileAppenderResilienceTest.java => FileAppenderResilience_AS_ROOT_Test.java} (73%) rename logback-core/src/test/java/ch/qos/logback/core/{WriterAppenderTest.java => OutputStreamAppenderTest.java} (98%) create mode 100644 logback-core/src/test/java/ch/qos/logback/core/util/ResilienceUtil.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-109) FileAppender writing to a shared (networked) file system
by Ceki Gulcu (JIRA) 03 Mar '10

03 Mar '10

FileAppender writing to a shared (networked) file system -------------------------------------------------------- Key: LBCORE-109 URL: http://jira.qos.ch/browse/LBCORE-109 Project: logback-core Issue Type: Bug Affects Versions: 0.9.9, 0.9.10, 0.9.11, 0.9.12, 0.9.13, 0.9.14, 0.9.15 Reporter: Ceki Gulcu Assignee: Logback dev list FileAppender writing to a shared (networked) file system with lost networked connection. -- 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

3 7

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-56-g63475d8
by git-noreply＠pixie.qos.ch 03 Mar '10

03 Mar '10

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 63475d86b35850ed5ed1ea735bf2bf38521ebbaf (commit) from e7d72885a2d1592597f70ae927812d9064b474bd (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=63475d86b35850ed5ed1ea73… http://github.com/ceki/logback/commit/63475d86b35850ed5ed1ea735bf2bf38521eb… commit 63475d86b35850ed5ed1ea735bf2bf38521ebbaf Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Mar 3 17:46:04 2010 +0100 Added blurb about encoders diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index ef6b2c2..964c4dd 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -28,7 +28,35 @@ <hr width="80%" align="center" /> - <h3>February 2010 - Release of version 0.9.19</h3> + <h3>March 2010 - Release of version 0.9.19</h3> + + + <div style="border: 1px solid #F44; background-color: #FED; padding-left: 1ex; padding-right: 1ex;"> + + <h4>Breaking change: FileAppender now expects an Encoder</h4> + + <p>In response to <a + href="http://jira.qos.ch/browse/LBCORE-128">LBCORE-128</a>, + <code>WriterAppender</code> has been renamed as + <code>OutputStreamAppender</code>, <code>FileAppender</code> now + sub-classing the latter. <code>OutputStreamAppender</code> and + sub-classes now take an <code>Encoder</code> instead of a + <code>Layout</code>. + </p> + + <p>Contrary to layouts which simply transform a logging event into + a String, an encoder is responsible for writing the actual event + or more accurately the representation of the event onto the output + stream. The role of the enclosing appender is now limited to + managing the output stream (opening/closing) but not writing + actual contents onto the stream. This change will require <a + href="codes.html#layoutInsteadOfEncoder"> modifications to + existing configuration files</a>. We hope to make up for this + inconvenience with cool new features which are only possible using + encoders. + </p> + + </div> <p>Added <a href="manual/appenders.html#OnMarkerEvaluator">OnMarkerEvaluator</a> diff --git a/logback-site/src/site/pages/reasonsToSwitch.html b/logback-site/src/site/pages/reasonsToSwitch.html index 7748701..f388cee 100644 --- a/logback-site/src/site/pages/reasonsToSwitch.html +++ b/logback-site/src/site/pages/reasonsToSwitch.html @@ -142,7 +142,7 @@ </p> <h3><a name="compression" href="#compression">Automatic - compression of archives log files</a></h3> + compression of archived log files</a></h3> <p><a href="manual/appenders.html#RollingFileAppender">RollingFileAppender</a> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/news.html | 30 +++++++++++++++++++++- logback-site/src/site/pages/reasonsToSwitch.html | 2 +- 2 files changed, 30 insertions(+), 2 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-191) It's not possible to build logback-classic using "mvn clean install -Dmaven.test.skip=true"
by Joern Huxhorn (JIRA) 03 Mar '10

03 Mar '10

It's not possible to build logback-classic using "mvn clean install -Dmaven.test.skip=true" ------------------------------------------------------------------------------------------- Key: LBCLASSIC-191 URL: http://jira.qos.ch/browse/LBCLASSIC-191 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.19 Environment: jhuxhorn@~/Documents/Projects/ceki/logback(master)$ mvn --version Apache Maven 2.2.0 (r788681; 2009-06-26 15:04:01+0200) Java version: 1.6.0_17 Java home: /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home Default locale: en_US, platform encoding: MacRoman OS name: "mac os x" version: "10.5.8" arch: "x86_64" Family: "mac" Reporter: Joern Huxhorn Assignee: Logback dev list Priority: Minor [junit] Running org.slf4j.test_osgi.BundleTest [junit] Tests run: 1, Failures: 0, Errors: 1, Time elapsed: 0 sec This is only problematic because of LBCLASSIC-112. SMTPAppender_SubethaSMTPTest keeps hanging and skipping tests isn't possible. I've @Ignored SMTPAppender_SubethaSMTPTest as a workaround for now. -- 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

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-55-ge7d7288
by git-noreply＠pixie.qos.ch 03 Mar '10

03 Mar '10

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 e7d72885a2d1592597f70ae927812d9064b474bd (commit) from 83516636bda43c43594d34e39f428f82ebeb1a18 (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=e7d72885a2d1592597f70ae9… http://github.com/ceki/logback/commit/e7d72885a2d1592597f70ae927812d9064b47… commit e7d72885a2d1592597f70ae927812d9064b474bd Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Mar 3 17:17:18 2010 +0100 Fixed LBCLASSIC-191 diff --git a/logback-classic/osgi-build.xml b/logback-classic/osgi-build.xml index 0e56c0b..615452d 100644 --- a/logback-classic/osgi-build.xml +++ b/logback-classic/osgi-build.xml @@ -1,6 +1,10 @@ <project name="osgi-test" default="testAll">  +  + <echo message="compile classpath: ${currentVersion}" /> <echo message="test classpath: ${test_classpath}" /> <echo message="basedir: ${basedir}" /> @@ -39,7 +46,7 @@ <mkdir dir="target/unit-reports" /> </target> - <target name="createIBundle"> + <target name="createIBundle" unless="maven.test.skip"> <mkdir dir="${bundlesDir}"/> <jar destFile="${iBundleJar}" manifest="src/IBUNDLE-META-INF/MANIFEST.MF" @@ -48,7 +55,7 @@ </target> - <target name="testAll" depends="init, createIBundle, logback"> + <target name="testAll" depends="init, createIBundle, logback" unless="maven.test.skip"> </target> @@ -71,8 +78,7 @@ invoked from the parent dir, which messes up theses tests. Hence, the fork="yes" dir="${basedir}" --> - - <target name="logback"> + <target name="logback" unless="maven.test.skip"> <prepareOSGiHarness binding="logback"/> <junit printsummary="yes" fork="yes" dir="${basedir}" haltonfailure="yes"> <classpath path="${test_classpath}"/> diff --git a/logback-core/src/main/java/ch/qos/logback/core/encoder/Encoder.java b/logback-core/src/main/java/ch/qos/logback/core/encoder/Encoder.java index 821db3d..42a46d9 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/encoder/Encoder.java +++ b/logback-core/src/main/java/ch/qos/logback/core/encoder/Encoder.java @@ -20,8 +20,8 @@ import ch.qos.logback.core.spi.ContextAware; import ch.qos.logback.core.spi.LifeCycle; public interface Encoder<E> extends ContextAware, LifeCycle { - - void doEncode(E event) throws IOException; + void init(OutputStream os) throws IOException; + void doEncode(E event) throws IOException; void close() throws IOException; } diff --git a/logback-examples/src/main/java/chapters/appenders/IOPerformance.java b/logback-examples/src/main/java/chapters/appenders/IOPerformance.java index 8804bcb..d74ddb7 100644 --- a/logback-examples/src/main/java/chapters/appenders/IOPerformance.java +++ b/logback-examples/src/main/java/chapters/appenders/IOPerformance.java @@ -57,9 +57,9 @@ public class IOPerformance extends Thread { fa.setAppend(true); fa.setContext(context); fa.start(); - - ((ch.qos.logback.classic.Logger)logger).addAppender(fa); - + + ((ch.qos.logback.classic.Logger) logger).addAppender(fa); + StatusPrinter.print(context); } @@ -80,7 +80,6 @@ public class IOPerformance extends Thread { // Second test with no immediate flushing perfCase(false, l); - // There is no fourth test as buffered IO and immediate flushing // do not make sense. } @@ -95,8 +94,7 @@ public class IOPerformance extends Thread { System.exit(1); } - static void perfCase(boolean immediateFlush, long len) - throws Exception { + static void perfCase(boolean immediateFlush, long len) throws Exception { IOPerformance[] threads = new IOPerformance[NUM_THREADS]; OtherIO otherIOThread = new OtherIO(); otherIOThread.start(); @@ -123,7 +121,7 @@ public class IOPerformance extends Thread { otherIOThread.interrupted = true; otherIOThread.join(); - System.out.println("On total throughput of " + (sum) + System.out.println("On total throughput of " + (sum) + " logs per microsecond."); System.out.println("------------------------------------------------"); } @@ -136,7 +134,7 @@ public class IOPerformance extends Thread { logger.debug(MSG); } - throughput = (len * 1.0) / ((System.nanoTime() - before)/1000); + throughput = (len * 1.0) / ((System.nanoTime() - before) / 1000); System.out.println(getName() + ", immediateFlush: " + immediateFlush + ", throughput: " + throughput + " logs per microsecond."); } @@ -148,19 +146,14 @@ class OtherIO extends Thread { public void run() { long before = System.nanoTime(); - try { FileWriter fw = new FileWriter(IOPerformance.PARALLEL_FILE, true); while (!interrupted) { -// if (counter++ % 1000 == 0) { -// Thread.yield(); -// } counter++; - fw.write("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + fw.write("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); fw.flush(); } - } catch (IOException e) { e.printStackTrace(); } ----------------------------------------------------------------------- Summary of changes: logback-classic/osgi-build.xml | 14 +++++++++--- .../java/ch/qos/logback/core/encoder/Encoder.java | 4 +- .../java/chapters/appenders/IOPerformance.java | 21 ++++++------------- 3 files changed, 19 insertions(+), 20 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. v0.9.18-54-g8351663
by git-noreply＠pixie.qos.ch 03 Mar '10

03 Mar '10

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 83516636bda43c43594d34e39f428f82ebeb1a18 (commit) from 0b234ba87bac07b450a46fd472e233c9e181f4ec (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=83516636bda43c43594d34e3… http://github.com/ceki/logback/commit/83516636bda43c43594d34e39f428f82ebeb1… commit 83516636bda43c43594d34e39f428f82ebeb1a18 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Mar 3 15:45:25 2010 +0100 - IO performace is hardly influenced by flushing diff --git a/logback-examples/src/main/java/chapters/appenders/IOPerformance.java b/logback-examples/src/main/java/chapters/appenders/IOPerformance.java new file mode 100644 index 0000000..8804bcb --- /dev/null +++ b/logback-examples/src/main/java/chapters/appenders/IOPerformance.java @@ -0,0 +1,172 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2009, 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 chapters.appenders; + +import java.io.FileWriter; +import java.io.IOException; + +import org.slf4j.Logger; + +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.encoder.PatternLayoutEncoder; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.FileAppender; +import ch.qos.logback.core.util.StatusPrinter; + +public class IOPerformance extends Thread { + static String MSG = "ABCDEGHIJKLMNOPQRSTUVWXYZabcdeghijklmnopqrstuvwxyz1234567890"; + static String LOG_FILE; + public static String PARALLEL_FILE; + + static int NUM_THREADS = 1; + static long l; + long len; + boolean immediateFlush; + Logger logger; + LoggerContext context; + double throughput; + + public IOPerformance(boolean _immediateFlush, long _len) { + this.len = _len; + this.immediateFlush = _immediateFlush; + context = new LoggerContext(); + logger = context.getLogger("logger-" + getName()); + + // A FileAppender is created according to the buffering and + // immediate flush setting of this IO instance. + FileAppender<ILoggingEvent> fa = new FileAppender<ILoggingEvent>(); + fa.setName("FILE"); + PatternLayoutEncoder pa = new PatternLayoutEncoder(); + pa.setPattern("%r %5p %c [%t] - %m%n"); + pa.setContext(context); + pa.start(); + fa.setEncoder(pa); + + fa.setFile(LOG_FILE); + fa.setAppend(true); + fa.setContext(context); + fa.start(); + + ((ch.qos.logback.classic.Logger)logger).addAppender(fa); + + StatusPrinter.print(context); + } + + public static void main(String[] argv) throws Exception { + if (argv.length != 3) { + usage("Wrong number of arguments."); + } + + l = Integer.parseInt(argv[0]); + LOG_FILE = argv[1]; + PARALLEL_FILE = argv[2]; + + // ---------------------------------------------------- + // first test with immediate flushing + perfCase(true, l); + + // ---------------------------------------------------- + // Second test with no immediate flushing + perfCase(false, l); + + + // There is no fourth test as buffered IO and immediate flushing + // do not make sense. + } + + static void usage(String msg) { + System.err.println(msg); + System.err.println("Usage: java " + IOPerformance.class.getName() + + " runLength logFile otherFile\n" + + " runLength (integer) the number of logs to generate perthread\n" + + " logFile path to a logFile\n" + + " otherFile path to a second file\n"); + System.exit(1); + } + + static void perfCase(boolean immediateFlush, long len) + throws Exception { + IOPerformance[] threads = new IOPerformance[NUM_THREADS]; + OtherIO otherIOThread = new OtherIO(); + otherIOThread.start(); + + // First create the threads + for (int i = 0; i < NUM_THREADS; i++) { + threads[i] = new IOPerformance(immediateFlush, len); + } + + // then start them + for (int i = 0; i < NUM_THREADS; i++) { + threads[i].start(); + } + + // wait for them to stop, compute the average throughput + double sum = 0; + + for (int i = 0; i < NUM_THREADS; i++) { + threads[i].join(); + sum += threads[i].throughput; + } + + // setting the interrupted field will cause counterThread to stop + otherIOThread.interrupted = true; + otherIOThread.join(); + + System.out.println("On total throughput of " + (sum) + + " logs per microsecond."); + System.out.println("------------------------------------------------"); + } + + public void run() { + + long before = System.nanoTime(); + + for (int i = 0; i < len; i++) { + logger.debug(MSG); + } + + throughput = (len * 1.0) / ((System.nanoTime() - before)/1000); + System.out.println(getName() + ", immediateFlush: " + immediateFlush + + ", throughput: " + throughput + " logs per microsecond."); + } +} + +class OtherIO extends Thread { + public boolean interrupted = false; + public int counter = 0; + + public void run() { + long before = System.nanoTime(); + + try { + FileWriter fw = new FileWriter(IOPerformance.PARALLEL_FILE, true); + + while (!interrupted) { +// if (counter++ % 1000 == 0) { +// Thread.yield(); +// } + counter++; + fw.write("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + fw.flush(); + } + + } catch (IOException e) { + e.printStackTrace(); + } + + double tput = (counter * 1.0) / (System.nanoTime() - before); + System.out.println("Counter thread " + getName() + + " incremented counter by " + tput + " per nanosecond."); + } +} ----------------------------------------------------------------------- Summary of changes: .../java/chapters/appenders/IOPerformance.java | 172 ++++++++++++++++++++ 1 files changed, 172 insertions(+), 0 deletions(-) create mode 100644 logback-examples/src/main/java/chapters/appenders/IOPerformance.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-112) ch.qos.logback.classic.net.SMTPAppender_SubethaSMTPTest hangs on Mac OS X
by Joern Huxhorn (JIRA) 03 Mar '10

03 Mar '10

ch.qos.logback.classic.net.SMTPAppender_SubethaSMTPTest hangs on Mac OS X ------------------------------------------------------------------------- Key: LBCLASSIC-112 URL: http://jira.qos.ch/browse/LBCLASSIC-112 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.16 Reporter: Joern Huxhorn Assignee: Logback dev list This test keeps hanging repeatedly at the very same spot. I'll attach a file with further info. -- 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

3 10

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-53-g0b234ba
by git-noreply＠pixie.qos.ch 03 Mar '10

03 Mar '10

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 0b234ba87bac07b450a46fd472e233c9e181f4ec (commit) from 650b73413e7b5aa4b0ef2fb59f0e3187c68b0554 (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=0b234ba87bac07b450a46fd4… http://github.com/ceki/logback/commit/0b234ba87bac07b450a46fd472e233c9e181f… commit 0b234ba87bac07b450a46fd472e233c9e181f4ec Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Mar 3 12:45:21 2010 +0100 - testing the error status code emitted by OutputStreamAppender when a layout is set instead of an encoder diff --git a/logback-classic/src/test/input/joran/compatibility/layoutInsteadOfEncoder.xml b/logback-classic/src/test/input/joran/compatibility/layoutInsteadOfEncoder.xml new file mode 100644 index 0000000..a50b1da --- /dev/null +++ b/logback-classic/src/test/input/joran/compatibility/layoutInsteadOfEncoder.xml @@ -0,0 +1,15 @@ +<configuration> + + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <file>target/test-output/layoutInsteadOfEncoder.log</file> + <append>true</append> + + <layout class="ch.qos.logback.classic.PatternLayout"> + <pattern>%msg%n</pattern> + </layout> + </appender> + + <root level="debug"> + <appender-ref ref="FILE" /> + </root> +</configuration> \ No newline at end of file diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/encoder/LayoutInsteadOfEncoderTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/encoder/LayoutInsteadOfEncoderTest.java new file mode 100644 index 0000000..f19db29 --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/encoder/LayoutInsteadOfEncoderTest.java @@ -0,0 +1,40 @@ +package ch.qos.logback.classic.encoder; + +import static ch.qos.logback.core.CoreConstants.CODES_URL; +import static org.junit.Assert.*; + +import org.junit.Before; +import org.junit.Test; + +import ch.qos.logback.classic.ClassicTestConstants; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.status.StatusChecker; +import ch.qos.logback.core.util.StatusPrinter; + +public class LayoutInsteadOfEncoderTest { + + // TeztConstants.TEST_DIR_PREFIX + "input/joran/ignore.xml" + JoranConfigurator jc = new JoranConfigurator(); + LoggerContext loggerContext = new LoggerContext(); + + @Before + public void setUp() { + jc.setContext(loggerContext); + + } + + // jc.doConfigure(TeztConstants.TEST_DIR_PREFIX + "input/joran/ignore.xml"); + + @Test + public void layoutInsteadOfEncoer() throws JoranException { + jc.doConfigure(ClassicTestConstants.JORAN_INPUT_PREFIX + + "compatibility/layoutInsteadOfEncoder.xml"); + StatusPrinter.print(loggerContext); + StatusChecker checker = new StatusChecker(loggerContext); + assertTrue(checker.containsMatch(Status.ERROR, "This appender no longer admits a layout as a sub-component")); + assertTrue(checker.containsMatch(Status.ERROR, "See also "+CODES_URL+"#layoutInsteadOfEncoder for details")); + } +} ----------------------------------------------------------------------- Summary of changes: .../joran/compatibility/layoutInsteadOfEncoder.xml | 15 +++++++ .../encoder/LayoutInsteadOfEncoderTest.java | 40 ++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) create mode 100644 logback-classic/src/test/input/joran/compatibility/layoutInsteadOfEncoder.xml create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/encoder/LayoutInsteadOfEncoderTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

The encoder branch merged with master
by Ceki Gülcü 03 Mar '10

03 Mar '10

Hello, This is to inform you that I have merge the encoder branch into the master branch. I am still documenting the changes. In short, WriterAppeder has been renamed as OutputStreamAppender, FileAppender now sub-classing the latter. OutputStreamAppender and sub-classes now take an Encoder instead of a Layout. Contrary to Layouts which simply transform a logging event into a String, an encoder is responsible for writing the actual event or more accurately the representation of the event into the output stream. The role of the enclosing appender now only manages the output stream (opening/closing) but not the actual contents written onto the stream. -- Ceki

2 5