August 2006 - logback-dev - mailman3.qos.ch

svn commit: r498 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi
by noreply.seb＠qos.ch 31 Aug '06

31 Aug '06

Author: seb Date: Thu Aug 31 09:38:24 2006 New Revision: 498 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java Log: two attributes made transient Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent2.java Thu Aug 31 09:38:24 2006 @@ -78,9 +78,9 @@ private transient Logger logger; - private ThrowableInformation throwableInfo; + transient private ThrowableInformation throwableInfo; - private CallerData[] callerDataArray; + transient private CallerData[] callerDataArray; private Marker marker;

1 0

svn commit: r497 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic main/java/ch/qos/logback/classic/pattern main/java/ch/qos/logback/classic/spi test/java/ch/qos/logback/classic test/java/ch/qos/logback/classic/boolex test/java/ch/qos/logback/classic/joran test/java/ch/qos/logback/classic/pattern
by noreply.seb＠qos.ch 30 Aug '06

30 Aug '06

Author: seb Date: Wed Aug 30 18:48:35 2006 New Revision: 497 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java Log: - Added - Added an Object[] argArray parameter to the LoggingEvent constructor. - Updated client classes accordingly. - Removed formattedMessage != null check in MessageConverter. - Removed message formatting calls from Logger. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java Wed Aug 30 18:48:35 2006 @@ -358,34 +358,33 @@ return childLogger; } + /** + * The next three methods could be merged. + * However, we decided not to merge them to make the calls to + * these methods more easily understandable, avoiding many instances + * of passing null parameters. + */ private void filterAndLog(String caller, Level level, String format, Throwable t) { - LoggingEvent le = new LoggingEvent(caller, this, level, format, t); + LoggingEvent le = new LoggingEvent(caller, this, level, format, t, null); if (loggerContext.getFilterChainDecision(le) != Filter.DENY) { - le.setFormattedMessage(format); callAppenders(le); } } private void filterAndLog(String caller, Level level, String format, Object[] argArray, Throwable t) { - LoggingEvent le = new LoggingEvent(caller, this, level, format, t); - le.setArgumentArray(argArray); + LoggingEvent le = new LoggingEvent(caller, this, level, format, t, argArray); if (loggerContext.getFilterChainDecision(le) != Filter.DENY) { - String formattedMessage = MessageFormatter.arrayFormat(format, argArray); - le.setFormattedMessage(formattedMessage); callAppenders(le); } } private void filterAndLog(String caller, Level level, Marker marker, String format, Object[] argArray, Throwable t) { - LoggingEvent le = new LoggingEvent(caller, this, level, format, t); + LoggingEvent le = new LoggingEvent(caller, this, level, format, t, argArray); le.setMarker(marker); - le.setArgumentArray(argArray); if (loggerContext.getFilterChainDecision(le) != Filter.DENY) { - String formattedMessage = MessageFormatter.arrayFormat(format, argArray); - le.setFormattedMessage(formattedMessage); callAppenders(le); } } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java Wed Aug 30 18:48:35 2006 @@ -20,9 +20,6 @@ public String convert(Object event) { LoggingEvent le = (LoggingEvent) event; - if (le.getFormattedMessage() == null) { - return le.getMessage(); - } return le.getFormattedMessage(); } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java Wed Aug 30 18:48:35 2006 @@ -18,6 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.Marker; +import org.slf4j.impl.MessageFormatter; import ch.qos.logback.classic.Level; @@ -97,7 +98,7 @@ } public LoggingEvent(String fqcn, Logger logger, Level level, String message, - Throwable throwable) { + Throwable throwable, Object[] argArray) { this.fqnOfLoggerClass = fqcn; this.logger = logger; this.level = level; @@ -106,14 +107,13 @@ if (throwable != null) { this.throwableInfo = new ThrowableInformation(throwable); } - timeStamp = System.currentTimeMillis(); - } - - public void setArgumentArray(Object[] argArray) { - if (this.argumentArray != null) { - throw new IllegalStateException("argArray has been already set"); + + if (argArray != null) { + formattedMessage = MessageFormatter.arrayFormat(message, argArray); + } else { + formattedMessage = message; } - this.argumentArray = argArray; + timeStamp = System.currentTimeMillis(); } public Object[] getArgumentArray() { @@ -257,14 +257,6 @@ return formattedMessage; } - public void setFormattedMessage(String formattedMessage) { - if (this.formattedMessage != null) { - throw new IllegalStateException( - "The formatted message has been already set for this event."); - } - this.formattedMessage = formattedMessage; - } - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { threadName = (String) in.readObject(); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java Wed Aug 30 18:48:35 2006 @@ -45,7 +45,7 @@ LoggingEvent makeLoggingEvent(Exception ex) { return new LoggingEvent(ch.qos.logback.core.pattern.FormattingConverter.class - .getName(), logger, Level.INFO, "Some message", ex); + .getName(), logger, Level.INFO, "Some message", ex, null); } public Object getEventObject() { Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java Wed Aug 30 18:48:35 2006 @@ -32,7 +32,7 @@ LoggingEvent makeLoggingEvent(Exception ex) { LoggingEvent e = new LoggingEvent(ch.qos.logback.core.pattern.FormattingConverter.class - .getName(), logger, Level.INFO, "Some message", ex); + .getName(), logger, Level.INFO, "Some message", ex, null); return e; } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java Wed Aug 30 18:48:35 2006 @@ -44,7 +44,7 @@ assertNotNull(evaluator); Logger logger = loggerContext.getLogger("xx"); - LoggingEvent event = new LoggingEvent("foo", logger, Level.DEBUG, "Hello world",null); + LoggingEvent event = new LoggingEvent("foo", logger, Level.DEBUG, "Hello world", null, null); StatusPrinter.print(loggerContext.getStatusManager()); assertTrue(evaluator.evaluate(event)); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java Wed Aug 30 18:48:35 2006 @@ -50,7 +50,7 @@ // particular test. LoggingEvent makeLoggingEvent(Exception ex) { return new LoggingEvent(ch.qos.logback.core.pattern.FormattingConverter.class - .getName(), logger, Level.INFO, "Some message", ex); + .getName(), logger, Level.INFO, "Some message", ex, null); } Exception getException(String msg, Exception cause) {

1 0

svn commit: r496 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern
by noreply.seb＠qos.ch 30 Aug '06

30 Aug '06

Author: seb Date: Wed Aug 30 16:43:17 2006 New Revision: 496 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java Log: MessageConverter needs to check what message it needs to return. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MessageConverter.java Wed Aug 30 16:43:17 2006 @@ -20,6 +20,9 @@ public String convert(Object event) { LoggingEvent le = (LoggingEvent) event; + if (le.getFormattedMessage() == null) { + return le.getMessage(); + } return le.getFormattedMessage(); }

1 0

svn commit: r495 - in logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic: . net
by noreply.seb＠qos.ch 30 Aug '06

30 Aug '06

Author: seb Date: Wed Aug 30 16:42:25 2006 New Revision: 495 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java Log: updated PackageTest and AllTest to include all tests Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllTest.java Wed Aug 30 16:42:25 2006 @@ -18,11 +18,12 @@ public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(ch.qos.logback.classic.control.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.PackageTest.suite()); - suite.addTest(ch.qos.logback.classic.pattern.PackageTest.suite()); + suite.addTest(ch.qos.logback.classic.control.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.joran.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.net.PackageTest.suite()); + suite.addTest(ch.qos.logback.classic.pattern.PackageTest.suite()); + return suite; } } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/PackageTest.java Wed Aug 30 16:42:25 2006 @@ -1,11 +1,11 @@ -/** - * LOGBack: the reliable, fast and flexible logging library for Java. - * - * Copyright (C) 1999-2005, QOS.ch, LOGBack.com - * - * This library is free software, you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation. +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. */ package ch.qos.logback.classic; @@ -19,6 +19,7 @@ suite.addTestSuite(DynamicLoggerContextTest.class); suite.addTestSuite(PatternLayoutTest.class); suite.addTestSuite(BasicLoggerTest.class); + suite.addTestSuite(MessageFormattingTest.class); return suite; } } \ No newline at end of file Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java Wed Aug 30 16:42:25 2006 @@ -1,11 +1,11 @@ /** - * LOGBack: the reliable, fast and flexible logging library for Java. - * + * Logback: the reliable, generic, fast and flexible logging framework. + * * Copyright (C) 1999-2006, QOS.ch - * - * This library is free software, you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation. + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. */ package ch.qos.logback.classic.net; @@ -19,6 +19,8 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(SyslogAppenderTest.class); + suite.addTestSuite(SMTPAppenderTest.class); + suite.addTestSuite(SocketAppenderTest.class); return suite; } } \ No newline at end of file

1 0

svn commit: r494 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control
by noreply.seb＠qos.ch 30 Aug '06

30 Aug '06

Author: seb Date: Wed Aug 30 16:18:41 2006 New Revision: 494 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java Log: updated Package Test Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java Wed Aug 30 16:18:41 2006 @@ -1,11 +1,11 @@ -/** - * LOGBack: the reliable, fast and flexible logging library for Java. - * - * Copyright (C) 1999-2005, QOS.ch, LOGBack.com - * - * This library is free software, you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation. +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. */ package ch.qos.logback.classic.control; @@ -16,6 +16,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(RandomUtilTest.class); + suite.addTestSuite(ScenarioMakerTest.class); return suite; } } \ No newline at end of file

1 0

svn commit: r490 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 29 Aug '06

29 Aug '06

Author: seb Date: Tue Aug 29 16:46:48 2006 New Revision: 490 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTestApp.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Log: on going work: testing SMTPAppender Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Tue Aug 29 16:46:48 2006 @@ -1,40 +1,89 @@ package ch.qos.logback.classic.net; -import org.slf4j.LoggerFactory; +import javax.mail.Address; +import javax.mail.MessagingException; -import ch.qos.logback.classic.Logger; +import junit.framework.TestCase; +import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.Layout; -import ch.qos.logback.core.util.StatusPrinter; -public class SMTPAppenderTest { +public class SMTPAppenderTest extends TestCase { - public static void main(String[] args) { + SMTPAppender appender; - Logger logger = (Logger) LoggerFactory.getLogger(SocketAppenderTestApp.class); - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); - SMTPAppender appender = new SMTPAppender(); + public void setUp() { + LoggerContext lc = new LoggerContext(); + appender = new SMTPAppender(); appender.setContext(lc); appender.setName("smtp"); appender.setFrom("user(a)host.dom"); appender.setLayout(buildLayout(lc)); appender.setSMTPHost("mail.qos.ch"); appender.setSubject("logging report"); - appender.setTo("sebastien(a)qos.ch"); - + appender.setTo("sebastien.nospam(a)qos.ch"); appender.start(); - - logger.addAppender(appender); - - for (int i = 0; i <= 10; i++) { - logger.debug("** Hello world. n=" + i); - } - logger.error("Triggering request"); + } + + public void testStart() { + try { + Address[] addressArray = appender.msg.getFrom(); + Address address = addressArray[0]; + assertEquals("user(a)host.dom", address.toString()); - StatusPrinter.print(lc.getStatusManager()); + addressArray = null; + address = null; + + addressArray = appender.msg.getAllRecipients(); + address = addressArray[0]; + assertEquals("sebastien.nospam(a)qos.ch", address.toString()); + + assertEquals("logging report", appender.msg.getSubject()); + + assertTrue(appender.isStarted()); + + } catch (MessagingException ex) { + fail("Unexpected exception."); + } + } + + public void testAppendNonTriggeringEvent() { + LoggingEvent event = new LoggingEvent(); + event.setThreadName("thead name"); + event.setLevel(Level.DEBUG); + appender.append(event); + assertEquals(1, appender.cb.length()); + } + + public void testEntryConditionsCheck() { + appender.checkEntryConditions(); + assertEquals(0, appender.getContext().getStatusManager().getCount()); } + public void testEntryConditionsCheckNoMessage() { + appender.msg = null; + appender.checkEntryConditions(); + assertEquals(1, appender.getContext().getStatusManager().getCount()); + } + + public void testEntryConditionsCheckNoEvaluator() { + appender.evaluator = null; + appender.checkEntryConditions(); + assertEquals(1, appender.getContext().getStatusManager().getCount()); + } + + public void testEntryConditionsCheckNoLayout() { + appender.setLayout(null); + appender.checkEntryConditions(); + assertEquals(1, appender.getContext().getStatusManager().getCount()); + } + + //TODO test defaultEvaluator == test triggering event + public void tearDown() { + appender = null; + } private static Layout buildLayout(LoggerContext lc) { PatternLayout layout = new PatternLayout(); layout.setContext(lc); @@ -44,5 +93,4 @@ layout.start(); return layout; } - } Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTestApp.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTestApp.java Tue Aug 29 16:46:48 2006 @@ -0,0 +1,48 @@ +package ch.qos.logback.classic.net; + +import org.slf4j.LoggerFactory; + +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.core.Layout; +import ch.qos.logback.core.util.StatusPrinter; + +public class SMTPAppenderTestApp { + + public static void main(String[] args) { + + Logger logger = (Logger) LoggerFactory.getLogger(SocketAppenderTestApp.class); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + SMTPAppender appender = new SMTPAppender(); + appender.setContext(lc); + appender.setName("smtp"); + appender.setFrom("user(a)host.dom"); + appender.setLayout(buildLayout(lc)); + appender.setSMTPHost("mail.qos.ch"); + appender.setSubject("logging report"); + appender.setTo("sebastien.nospam(a)qos.ch"); + + appender.start(); + + logger.addAppender(appender); + + for (int i = 0; i <= 10; i++) { + logger.debug("** Hello world. n=" + i); + } + logger.error("Triggering request"); + + StatusPrinter.print(lc.getStatusManager()); + } + + private static Layout buildLayout(LoggerContext lc) { + PatternLayout layout = new PatternLayout(); + layout.setContext(lc); + layout.setHeader("Some header\n"); + layout.setPattern("%-4relative [%thread] %-5level %class - %msg%n"); + layout.setFooter("Some footer"); + layout.start(); + return layout; + } + +}

1 0

svn commit: r487 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 29 Aug '06

29 Aug '06

Author: seb Date: Tue Aug 29 15:00:36 2006 New Revision: 487 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Log: on going work on SocketAppender Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Tue Aug 29 15:00:36 2006 @@ -0,0 +1,52 @@ +package ch.qos.logback.classic.net; + +import junit.framework.TestCase; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.core.appender.ListAppender; + +public class SocketAppenderTest extends TestCase{ + + LoggerContext lc; + ListAppender remoteListAppender; + + public void testStartFailNoRemoteHost() { + LoggerContext lc = new LoggerContext(); + SocketAppender appender = new SocketAppender(); + appender.setContext(lc); + appender.setPort(123); + appender.start(); + assertEquals(1, lc.getStatusManager().getCount()); + } + + public void testRecieveMessage() { + Logger logger = lc.getLogger(LoggerContext.ROOT_NAME); + logger.debug("test"); + assertEquals(1, remoteListAppender.list.size()); + } + + public void setUp() { + //client configuration + lc = new LoggerContext(); + Logger root = lc.getLogger(LoggerContext.ROOT_NAME); + SocketAppender socket = new SocketAppender(); + socket.setContext(lc); + socket.setName("socket"); + socket.setPort(4560); + socket.setRemoteHost("localhost"); + root.addAppender(socket); + + //server configuration + LoggerContext remoteLc = ((Logger)SimpleSocketServer.logger).getLoggerContext(); + Logger remoteRoot = remoteLc.getLogger(LoggerContext.ROOT_NAME); + remoteListAppender = new ListAppender(); + remoteListAppender.setContext(remoteLc); + remoteListAppender.setName("list"); + remoteRoot.addAppender(remoteListAppender); + SimpleSocketServer.runServer(); + } + + public void tearDown() { + lc = null; + } +}

1 0

svn commit: r486 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/net main/java/ch/qos/logback/classic/spi test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 29 Aug '06

29 Aug '06

Author: seb Date: Tue Aug 29 15:00:10 2006 New Revision: 486 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTestApp.java Log: on going work on SocketAppender Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java Tue Aug 29 15:00:10 2006 @@ -22,17 +22,17 @@ * A simple {@link SocketNode} based server. * * <pre> - * Usage: java ch.qos.logback.classic.net.SimpleSocketServer port configFile - * - * where + * Usage: java ch.qos.logback.classic.net.SimpleSocketServer port configFile + * + * where * * port * - * is a part number where the server listens and + * is a part number where the server listens and * * configFile * - * is an xml configuration file fed to {@link JoranConfigurator}. + * is an xml configuration file fed to {@link JoranConfigurator}. * </pre> * * @author Ceki Gülcü @@ -53,6 +53,10 @@ usage("Wrong number of arguments."); } + runServer(); + } + + static void runServer() { try { logger.info("Listening on port " + port); ServerSocket serverSocket = new ServerSocket(port); @@ -61,9 +65,8 @@ Socket socket = serverSocket.accept(); logger.info("Connected to client at " + socket.getInetAddress()); logger.info("Starting new socket node."); - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); - new Thread(new SocketNode(socket, lc)) - .start(); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + new Thread(new SocketNode(socket, lc)).start(); } } catch (Exception e) { e.printStackTrace(); @@ -86,7 +89,7 @@ } if (configFile.endsWith(".xml")) { - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); configurator.doConfigure(configFile); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java Tue Aug 29 15:00:10 2006 @@ -15,7 +15,6 @@ import java.io.ObjectOutputStream; import java.net.InetAddress; import java.net.Socket; -import java.util.Calendar; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.AppenderBase; @@ -139,7 +138,7 @@ this.address = address; this.remoteHost = address.getHostName(); this.port = port; - //connect(address, port); + // connect(address, port); } /** @@ -149,15 +148,15 @@ this.port = port; this.address = getAddressByName(host); this.remoteHost = host; - //connect(address, port); + // connect(address, port); } - // /** - // * Connect to the specified RemoteHost and Port. - // */ - // public void activateOptions() { - // connect(address, port); - // } + // /** + // * Connect to the specified RemoteHost and Port. + // */ + // public void activateOptions() { + // connect(address, port); + // } /** * Start this appender. @@ -226,7 +225,7 @@ oos = new ObjectOutputStream(new Socket(address, port).getOutputStream()); } catch (IOException e) { - String msg = "Could not connect to remote log4j server at [" + String msg = "Could not connect to remote logback server at [" + address.getHostName() + "]."; if (reconnectionDelay > 0) { msg += " We will try again later."; @@ -236,6 +235,9 @@ } } + + int count = 0; + long total = 0; @Override protected void append(Object event) { @@ -250,11 +252,13 @@ if (oos != null) { try { - Long t1 = Calendar.getInstance().getTimeInMillis(); + Long t1 = System.nanoTime(); oos.writeObject(event); - Long t2 = Calendar.getInstance().getTimeInMillis(); - addInfo("=========Writing time: " + Long.toString(t2-t1)); - addInfo("=========Flushing."); + Long t2 = System.nanoTime(); + long delta = t2-t1; + total += delta; + addInfo("** Writing time: " + Long.toString(delta) + " total: " + ++count + " median: " + total/count); + //addInfo("=========Flushing."); oos.flush(); if (++counter >= RESET_FREQUENCY) { counter = 0; @@ -293,14 +297,6 @@ } /** - * The SocketAppender does not use a layout. Hence, this method returns - * <code>false</code>. - */ - public boolean requiresLayout() { - return false; - } - - /** * The RemoteHost option takes a string value which should be the host * name of the server where a {@link SocketNode} is running. */ Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java Tue Aug 29 15:00:10 2006 @@ -80,14 +80,14 @@ } } } catch (java.io.EOFException e) { - logger.info("Caught java.io.EOFException closing conneciton."); + logger.info("Caught java.io.EOFException closing connection."); } catch (java.net.SocketException e) { - logger.info("Caught java.net.SocketException closing conneciton."); + logger.info("Caught java.net.SocketException closing connection."); } catch (IOException e) { logger.info("Caught java.io.IOException: " + e); logger.info("Closing connection."); } catch (Exception e) { - logger.error("Unexpected exception. Closing conneciton.", e); + logger.error("Unexpected exception. Closing connection.", e); } try { Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java Tue Aug 29 15:00:10 2006 @@ -10,10 +10,13 @@ package ch.qos.logback.classic.spi; - -import java.io.Serializable; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.slf4j.Marker; import ch.qos.logback.classic.Level; @@ -22,219 +25,253 @@ * The internal representation of logging events. When an affirmative decision * is made to log then a <code>LoggingEvent</code> instance is created. This * instance is passed around to the different Logback components. - * - * Writers of Logback components such as appenders should be - * aware of that some of the LoggingEvent fields are initialized lazily. - * Therefore, an appender wishing to output data to be later correctly read - * by a receiver, must initialize "lazy" fields prior to writing them out. - * See the {@link #prepareForDeferredProcessing()} method for the exact list. + * + * + * Writers of Logback components such as appenders should be aware of that some + * of the LoggingEvent fields are initialized lazily. Therefore, an appender + * wishing to output data to be later correctly read by a receiver, must + * initialize "lazy" fields prior to writing them out. See the + * {@link #prepareForDeferredProcessing()} method for the exact list. + * * * @author Ceki Gülcü */ -public class LoggingEvent implements Serializable { +public class LoggingEvent implements Externalizable { + + /** + * + */ + private static final long serialVersionUID = 3022264832697160750L; + + /** + * + */ + private static long startTime = System.currentTimeMillis(); + + /** + * Fully qualified name of the calling Logger class. This field does not + * survive serialization. + * + * + * Note that the getCallerInformation() method relies on this fact. + */ + transient String fqnOfLoggerClass; + + /** + * The name of thread in which this logging event was generated. + */ + private String threadName; - - /** + /** + * Level of logging event. + * + * + * This field should not be accessed directly. You shoud use the {@link + * #getLevel} method instead. + * * */ - private static final long serialVersionUID = -7298433437463204531L; + private Level level; + + private String message; + private Object[] argumentArray; + + private Logger logger; + + private ThrowableInformation throwableInfo; + + private CallerData[] callerDataArray; + + private Marker marker; /** - * - */ - private static long startTime = System.currentTimeMillis(); - - /** - * Fully qualified name of the calling Logger class. This field does not - * survive serialization. - * - * Note that the getCallerInformation() method relies on this fact. - */ - transient String fqnOfLoggerClass; - - - /** - * The name of thread in which this logging event was generated. - */ - private String threadName; - - /** - * Level of logging event. - * - * - * This field should not be accessed directly. You shoud use the {@link - * #getLevel} method instead. - * - * - */ - private Level level; - - private String message; - private Object[] argumentArray; - - private Logger logger; - - private ThrowableInformation throwableInfo; - - private CallerData[] callerDataArray; - - private Marker marker; - - /** - * The number of milliseconds elapsed from 1/1/1970 until logging event was - * created. - */ - private long timeStamp; - - public LoggingEvent(String fqcn, Logger logger, Level level, String message, Throwable throwable) { - this.fqnOfLoggerClass = fqcn; - this.logger = logger; - this.level = level; - this.message = message; - - if (throwable != null) { - this.throwableInfo = new ThrowableInformation(throwable); - } - timeStamp = System.currentTimeMillis(); - } - - public void setArgumentArray(Object[] argArray) { - if (this.argumentArray != null) { - throw new IllegalStateException("argArray has been already set"); - } - this.argumentArray = argArray; - } - - public Object[] getArgumentArray() { - return this.argumentArray; - } - - public Level getLevel() { - return level; - } - - public String getThreadName() { - if (threadName == null) { - threadName = (Thread.currentThread()).getName(); - } - return threadName; - } - - /** - * @param threadName The threadName to set. - * @throws IllegalStateException If threadName has been already set. - */ - public void setThreadName(String threadName) - throws IllegalStateException { - if (this.threadName != null) { - throw new IllegalStateException("threadName has been already set"); - } - this.threadName = threadName; - } - - /** - * Returns the throwable information contained within this event. May be - * <code>null</code> if there is no such information. - */ - public ThrowableInformation getThrowableInformation() { - return throwableInfo; - } - - /** - * Set this event's throwable information. - */ - public void setThrowableInformation(ThrowableInformation ti) { - if (throwableInfo != null) { - throw new IllegalStateException("ThrowableInformation has been already set."); - } else { - throwableInfo = ti; - } - } - - /** - * This method should be called prior to serializing an event. It should also - * be called when using asynchronous logging. - */ - public void prepareForDeferredProcessing() { - this.getThreadName(); - } - - public Logger getLogger() { - return logger; - } - - public void setLogger(Logger logger) { - this.logger = logger; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - if (this.message != null) { - throw new IllegalStateException("The message for this event has been set already."); - } - this.message = message; - } - - public long getTimeStamp() { - return timeStamp; - } - - public void setTimeStamp(long timeStamp) { - this.timeStamp = timeStamp; - } - - public void setLevel(Level level) { - if (this.level != null) { - throw new IllegalStateException("The level has been already set for this event."); - } - this.level = level; - } - - /** - * The time at which this class was loaded into memory, expressed in millisecond - * elapsed since the epoch (1.1.1970). - * - * @return The time as measured when this class was loaded into memory. - */ - public static final long getStartTime() { - return startTime; - } - - /** - * Get the caller information for this logging event. If caller - * information is null at the time of its invocation, this method extracts - * location information. The collected information is cached for future use. - * - * Note that after serialization it is impossible to correctly extract - * caller information. - */ - public CallerData[] getCallerData() { - // we rely on the fact that fqnOfLoggerClass does not survive - // serialization - if (callerDataArray == null && fqnOfLoggerClass != null) { - callerDataArray = CallerData.extract(new Throwable(), fqnOfLoggerClass); - } - return callerDataArray; - } - - public void setCallerInformation(CallerData[] callerDataArray) { - this.callerDataArray = callerDataArray; - } - - public Marker getMarker() { - return marker; - } - - public void setMarker(Marker marker) { - if (this.marker != null) { - throw new IllegalStateException("The marker has been already set for this event."); - } - this.marker = marker; - } - - + * The number of milliseconds elapsed from 1/1/1970 until logging event was + * created. + */ + private long timeStamp; + + public LoggingEvent() { + } + + public LoggingEvent(String fqcn, Logger logger, Level level, String message, + Throwable throwable) { + this.fqnOfLoggerClass = fqcn; + this.logger = logger; + this.level = level; + this.message = message; + + if (throwable != null) { + this.throwableInfo = new ThrowableInformation(throwable); + } + timeStamp = System.currentTimeMillis(); + } + + public void setArgumentArray(Object[] argArray) { + if (this.argumentArray != null) { + throw new IllegalStateException("argArray has been already set"); + } + this.argumentArray = argArray; + } + + public Object[] getArgumentArray() { + return this.argumentArray; + } + + public Level getLevel() { + return level; + } + + public String getThreadName() { + if (threadName == null) { + threadName = (Thread.currentThread()).getName(); + } + return threadName; + } + + /** + * @param threadName + * The threadName to set. + * @throws IllegalStateException + * If threadName has been already set. + */ + public void setThreadName(String threadName) throws IllegalStateException { + if (this.threadName != null) { + throw new IllegalStateException("threadName has been already set"); + } + this.threadName = threadName; + } + + /** + * Returns the throwable information contained within this event. May be + * <code>null</code> if there is no such information. + */ + public ThrowableInformation getThrowableInformation() { + return throwableInfo; + } + + /** + * Set this event's throwable information. + */ + public void setThrowableInformation(ThrowableInformation ti) { + if (throwableInfo != null) { + throw new IllegalStateException( + "ThrowableInformation has been already set."); + } else { + throwableInfo = ti; + } + } + + /** + * This method should be called prior to serializing an event. It should also + * be called when using asynchronous logging. + */ + public void prepareForDeferredProcessing() { + this.getThreadName(); + } + + public Logger getLogger() { + return logger; + } + + public void setLogger(Logger logger) { + this.logger = logger; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + if (this.message != null) { + throw new IllegalStateException( + "The message for this event has been set already."); + } + this.message = message; + } + + public long getTimeStamp() { + return timeStamp; + } + + public void setTimeStamp(long timeStamp) { + this.timeStamp = timeStamp; + } + + public void setLevel(Level level) { + if (this.level != null) { + throw new IllegalStateException( + "The level has been already set for this event."); + } + this.level = level; + } + + /** + * The time at which this class was loaded into memory, expressed in + * millisecond elapsed since the epoch (1.1.1970). + * + * @return The time as measured when this class was loaded into memory. + */ + public static final long getStartTime() { + return startTime; + } + + /** + * Get the caller information for this logging event. If caller information is + * null at the time of its invocation, this method extracts location + * information. The collected information is cached for future use. + * + * + * Note that after serialization it is impossible to correctly extract caller + * information. + * + */ + public CallerData[] getCallerData() { + // we rely on the fact that fqnOfLoggerClass does not survive + // serialization + if (callerDataArray == null && fqnOfLoggerClass != null) { + callerDataArray = CallerData.extract(new Throwable(), fqnOfLoggerClass); + } + return callerDataArray; + } + + public void setCallerInformation(CallerData[] callerDataArray) { + this.callerDataArray = callerDataArray; + } + + public Marker getMarker() { + return marker; + } + + public void setMarker(Marker marker) { + if (this.marker != null) { + throw new IllegalStateException( + "The marker has been already set for this event."); + } + this.marker = marker; + } + + public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + threadName = (String)in.readObject(); + message = (String) in.readObject(); + int levelInt = in.readInt(); + level = Level.toLevel(levelInt); + String loggerName = (String)in.readObject(); + logger = LoggerFactory.getLogger(loggerName); + } + + public void writeExternal(ObjectOutput out) throws IOException { + if (threadName != null) { + out.writeObject(threadName); + } else { + out.writeObject("noThreadName"); + } + out.writeObject(message); + out.writeInt(level.levelInt); + out.writeObject(logger.getName()); + + // out.writeObject(throwableInfo); + // out.writeObject(callerDataArray); + // out.writeObject(marker); + } } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTestApp.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTestApp.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTestApp.java Tue Aug 29 15:00:10 2006 @@ -23,8 +23,7 @@ for (int i = 0; i <= 1000; i++) { logger.debug("** Hello world. n=" + i); } - - + StatusPrinter.print(lc.getStatusManager()); }

1 0

svn commit: r485 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.seb＠qos.ch 24 Aug '06

24 Aug '06

Author: seb Date: Thu Aug 24 16:26:25 2006 New Revision: 485 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTestApp.java - copied, changed from r483, logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Log: renamed SocketAppenderTest to SockerAppenderTestApp to free the space for a real SocketAppenderTest unit test class Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Thu Aug 24 16:26:25 2006 @@ -12,7 +12,7 @@ public static void main(String[] args) { - Logger logger = (Logger) LoggerFactory.getLogger(SocketAppenderTest.class); + Logger logger = (Logger) LoggerFactory.getLogger(SocketAppenderTestApp.class); LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); SMTPAppender appender = new SMTPAppender(); appender.setContext(lc); Copied: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTestApp.java (from r483, logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java) ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTestApp.java Thu Aug 24 16:26:25 2006 @@ -7,11 +7,11 @@ import ch.qos.logback.core.util.StatusPrinter; -public class SocketAppenderTest { +public class SocketAppenderTestApp { public static void main(String[] args) { - Logger logger = (Logger) LoggerFactory.getLogger(SocketAppenderTest.class); + Logger logger = (Logger) LoggerFactory.getLogger(SocketAppenderTestApp.class); LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); SocketAppender appender = new SocketAppender("localhost", 4560); appender.setContext(lc);

1 0

svn commit: r484 - in logback/trunk: logback-classic/examples logback-classic/examples/classes logback-classic/src/main/java/ch/qos/logback/classic/helpers logback-classic/src/main/java/ch/qos/logback/classic/net logback-classic/src/test/java/ch/qos/logback/classic/net logback-site
by noreply.seb＠qos.ch 24 Aug '06

24 Aug '06

Author: seb Date: Thu Aug 24 16:24:39 2006 New Revision: 484 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/helpers/ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/helpers/CyclicBuffer.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Modified: logback/trunk/logback-classic/examples/ (props changed) logback/trunk/logback-classic/examples/classes/ (props changed) logback/trunk/logback-site/ (props changed) Log: - SMTPAppender: on going work. - A working version of this appender is commited. Reliable tests will follow. - Minor ignore-list modifications. Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/helpers/CyclicBuffer.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/helpers/CyclicBuffer.java Thu Aug 24 16:24:39 2006 @@ -0,0 +1,153 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + +package ch.qos.logback.classic.helpers; + +import ch.qos.logback.classic.spi.LoggingEvent; + + +/** + + CyclicBuffer is used by other appenders to hold {@link LoggingEvent + LoggingEvents} for immediate or differed display. + + This buffer gives read access to any element in the buffer not + just the first or last element. + + @author Ceki Gülcü + @since 0.9.0 + + */ +public class CyclicBuffer { + + LoggingEvent[] ea; + int first; + int last; + int numElems; + int maxSize; + + /** + Instantiate a new CyclicBuffer of at most <code>maxSize</code> events. + + The <code>maxSize</code> argument must a positive integer. + + @param maxSize The maximum number of elements in the buffer. + */ + public CyclicBuffer(int maxSize) throws IllegalArgumentException { + if(maxSize < 1) { + throw new IllegalArgumentException("The maxSize argument ("+maxSize+ + ") is not a positive integer."); + } + this.maxSize = maxSize; + ea = new LoggingEvent[maxSize]; + first = 0; + last = 0; + numElems = 0; + } + + /** + Add an <code>event</code> as the last event in the buffer. + + */ + public + void add(LoggingEvent event) { + ea[last] = event; + if(++last == maxSize) + last = 0; + + if(numElems < maxSize) + numElems++; + else if(++first == maxSize) + first = 0; + } + + + /** + Get the ith oldest event currently in the buffer. If + i is outside the range 0 to the number of elements + currently in the buffer, then <code>null</code> is returned. + + + */ + public + LoggingEvent get(int i) { + if(i < 0 || i >= numElems) + return null; + + return ea[(first + i) % maxSize]; + } + + public + int getMaxSize() { + return maxSize; + } + + /** + Get the oldest (first) element in the buffer. The oldest element + is removed from the buffer. + */ + public + LoggingEvent get() { + LoggingEvent r = null; + if(numElems > 0) { + numElems--; + r = ea[first]; + ea[first] = null; + if(++first == maxSize) + first = 0; + } + return r; + } + + /** + Get the number of elements in the buffer. This number is + guaranteed to be in the range 0 to <code>maxSize</code> + (inclusive). + */ + public + int length() { + return numElems; + } + + /** + Resize the cyclic buffer to <code>newSize</code>. + + @throws IllegalArgumentException if <code>newSize</code> is negative. + */ + public + void resize(int newSize) { + if(newSize < 0) { + throw new IllegalArgumentException("Negative array size ["+newSize+ + "] not allowed."); + } + if(newSize == numElems) + return; // nothing to do + + LoggingEvent[] temp = new LoggingEvent[newSize]; + + int loopLen = newSize < numElems ? newSize : numElems; + + for(int i = 0; i < loopLen; i++) { + temp[i] = ea[first]; + ea[first] = null; + if(++first == numElems) + first = 0; + } + ea = temp; + first = 0; + numElems = loopLen; + maxSize = newSize; + if (loopLen == newSize) { + last = 0; + } else { + last = loopLen; + } + } +} Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java Thu Aug 24 16:24:39 2006 @@ -0,0 +1,399 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + +package ch.qos.logback.classic.net; + +import java.io.File; +import java.util.Date; +import java.util.Properties; + +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Multipart; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeBodyPart; +import javax.mail.internet.MimeMessage; +import javax.mail.internet.MimeMultipart; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.helpers.CyclicBuffer; +import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.AppenderBase; +import ch.qos.logback.core.Layout; +import ch.qos.logback.core.rolling.TriggeringPolicy; +import ch.qos.logback.core.util.OptionHelper; + +/** + * Send an e-mail when a specific logging event occurs, typically on errors or + * fatal errors. + * + * + * The number of logging events delivered in this e-mail depend on the value of + * BufferSize option. The <code>SMTPAppender</code> keeps only the + * last <code>BufferSize</code> logging events in its cyclic buffer. This + * keeps memory requirements at a reasonable level while still delivering useful + * application context. + * + * @author Ceki Gülcü + * @author Sébastien Pennec + * + * @since 1.0 + */ +public class SMTPAppender extends AppenderBase { + private Layout layout; + + private String to; + private String from; + private String subject; + private String smtpHost; + private int bufferSize = 512; + private boolean locationInfo = false; + + protected CyclicBuffer cb = new CyclicBuffer(bufferSize); + protected Message msg; + + protected TriggeringPolicy evaluator; + + /** + * The default constructor will instantiate the appender with a + * {@link TriggeringEventEvaluator} that will trigger on events with level + * ERROR or higher. + */ + public SMTPAppender() { + this(new DefaultEvaluator()); + } + + /** + * Use <code>evaluator</code> passed as parameter as the {@link + * TriggeringEventEvaluator} for this SMTPAppender. + */ + public SMTPAppender(TriggeringPolicy evaluator) { + this.evaluator = evaluator; + } + + /** + * Start the appender + */ + public void start() { + Properties props = new Properties(System.getProperties()); + if (smtpHost != null) { + props.put("mail.smtp.host", smtpHost); + } + + Session session = Session.getInstance(props, null); + // session.setDebug(true); + msg = new MimeMessage(session); + + try { + if (from != null) { + msg.setFrom(getAddress(from)); + } else { + msg.setFrom(); + } + + msg.setRecipients(Message.RecipientType.TO, parseAddress(to)); + if (subject != null) { + msg.setSubject(subject); + } + + started = true; + + } catch (MessagingException e) { + addError("Could not activate SMTPAppender options.", e); + } + } + + /** + * Perform SMTPAppender specific appending actions, mainly adding the event to + * a cyclic buffer and checking if the event triggers an e-mail to be sent. + */ + protected void append(Object eventObject) { + LoggingEvent event = (LoggingEvent) eventObject; + + if (!checkEntryConditions()) { + return; + } + + event.getThreadName(); + // event.getNDC(); + // if (locationInfo) { + // event.getLocationInformation(); + // } + cb.add(event); + //addInfo("Added event to the cyclic buffer: " + event.getMessage()); + + if (evaluator.isTriggeringEvent(null, event)) { + sendBuffer(); + } + } + + /** + * This method determines if there is a sense in attempting to append. + * + * + * It checks whether there is a set output target and also if there is a set + * layout. If these checks fail, then the boolean value <code>false</code> + * is returned. + */ + protected boolean checkEntryConditions() { + if (this.msg == null) { + addError("Message object not configured."); + return false; + } + + if (this.evaluator == null) { + addError("No TriggeringPolicy is set for appender [" + name + "]."); + return false; + } + + if (this.layout == null) { + addError("No layout set for appender named [" + name + "]."); + return false; + } + return true; + } + + synchronized public void stop() { + this.started = false; + } + + InternetAddress getAddress(String addressStr) { + try { + return new InternetAddress(addressStr); + } catch (AddressException e) { + addError("Could not parse address [" + addressStr + "].", e); + return null; + } + } + + InternetAddress[] parseAddress(String addressStr) { + try { + return InternetAddress.parse(addressStr, true); + } catch (AddressException e) { + addError("Could not parse address [" + addressStr + "].", e); + return null; + } + } + + /** + * Returns value of the To option. + */ + public String getTo() { + return to; + } + + /** + * The <code>SMTPAppender</code> requires a {@link org.apache.log4j.Layout + * layout}. + */ + public boolean requiresLayout() { + return true; + } + + /** + * Send the contents of the cyclic buffer as an e-mail message. + */ + protected void sendBuffer() { + + // Note: this code already owns the monitor for this + // appender. This frees us from needing to synchronize on 'cb'. + try { + MimeBodyPart part = new MimeBodyPart(); + + StringBuffer sbuf = new StringBuffer(); + String t = layout.getHeader(); + if (t != null) + sbuf.append(t); + int len = cb.length(); + for (int i = 0; i < len; i++) { + //sbuf.append(MimeUtility.encodeText(layout.format(cb.get()))); + LoggingEvent event = cb.get(); + sbuf.append(layout.doLayout(event)); + // if (layout.ignoresThrowable()) { + // String[] s = event.getThrowableStrRep(); + // if (s != null) { + // for (int j = 0; j < s.length; j++) { + // sbuf.append(s[j]); + // } + // } + // } + } + t = layout.getFooter(); + if (t != null) + sbuf.append(t); + part.setContent(sbuf.toString(), "text/plain"); + + Multipart mp = new MimeMultipart(); + mp.addBodyPart(part); + msg.setContent(mp); + + msg.setSentDate(new Date()); + Transport.send(msg); + } catch (Exception e) { + addError("Error occured while sending e-mail notification.", e); + } + } + + /** + * Returns value of the EvaluatorClass option. + */ + public String getEvaluatorClass() { + return evaluator == null ? null : evaluator.getClass().getName(); + } + + /** + * Returns value of the From option. + */ + public String getFrom() { + return from; + } + + /** + * Returns value of the Subject option. + */ + public String getSubject() { + return subject; + } + + /** + * The From option takes a string value which should be a e-mail + * address of the sender. + */ + public void setFrom(String from) { + this.from = from; + } + + /** + * The Subject option takes a string value which should be a the + * subject of the e-mail message. + */ + public void setSubject(String subject) { + this.subject = subject; + } + + /** + * The BufferSize option takes a positive integer representing the + * maximum number of logging events to collect in a cyclic buffer. When the + * <code>BufferSize</code> is reached, oldest events are deleted as new + * events are added to the buffer. By default the size of the cyclic buffer is + * 512 events. + */ + public void setBufferSize(int bufferSize) { + this.bufferSize = bufferSize; + cb.resize(bufferSize); + } + + /** + * The SMTPHost option takes a string value which should be a the host + * name of the SMTP server that will send the e-mail message. + */ + public void setSMTPHost(String smtpHost) { + this.smtpHost = smtpHost; + } + + /** + * Returns value of the SMTPHost option. + */ + public String getSMTPHost() { + return smtpHost; + } + + /** + * The To option takes a string value which should be a comma + * separated list of e-mail address of the recipients. + */ + public void setTo(String to) { + this.to = to; + } + + /** + * Returns value of the BufferSize option. + */ + public int getBufferSize() { + return bufferSize; + } + + /** + * The EvaluatorClass option takes a string value representing the + * name of the class implementing the {@link TriggeringEventEvaluator} + * interface. A corresponding object will be instantiated and assigned as the + * triggering event evaluator for the SMTPAppender. + */ + public void setEvaluatorClass(String value) { + try { + evaluator = (TriggeringPolicy) OptionHelper.instantiateByClassName(value, + TriggeringPolicy.class); + } catch (Exception ex) { + addError("Evaluator class instanciation failed"); + } + } + + /** + * The LocationInfo option takes a boolean value. By default, it is + * set to false which means there will be no effort to extract the location + * information related to the event. As a result, the layout that formats the + * events as they are sent out in an e-mail is likely to place the wrong + * location information (if present in the format). + * + * + * Location information extraction is comparatively very slow and should be + * avoided unless performance is not a concern. + */ + public void setLocationInfo(boolean locationInfo) { + this.locationInfo = locationInfo; + } + + /** + * Returns value of the LocationInfo option. + */ + public boolean getLocationInfo() { + return locationInfo; + } + + public Layout getLayout() { + return layout; + } + + public void setLayout(Layout layout) { + this.layout = layout; + } +} + +class DefaultEvaluator implements TriggeringPolicy { + + private boolean started; + + /** + * Is this <code>event</code> the e-mail triggering event? + * + * + * This method returns <code>true</code>, if the event level has ERROR + * level or higher. Otherwise it returns <code>false</code>. + */ + public boolean isTriggeringEvent(File file, Object eventObject) { + LoggingEvent event = (LoggingEvent) eventObject; + return event.getLevel().isGreaterOrEqual(Level.ERROR); + } + + public boolean isStarted() { + return started == true; + } + + public void start() { + started = true; + } + + public void stop() { + started = false; + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppenderTest.java Thu Aug 24 16:24:39 2006 @@ -0,0 +1,48 @@ +package ch.qos.logback.classic.net; + +import org.slf4j.LoggerFactory; + +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.core.Layout; +import ch.qos.logback.core.util.StatusPrinter; + +public class SMTPAppenderTest { + + public static void main(String[] args) { + + Logger logger = (Logger) LoggerFactory.getLogger(SocketAppenderTest.class); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + SMTPAppender appender = new SMTPAppender(); + appender.setContext(lc); + appender.setName("smtp"); + appender.setFrom("user(a)host.dom"); + appender.setLayout(buildLayout(lc)); + appender.setSMTPHost("mail.qos.ch"); + appender.setSubject("logging report"); + appender.setTo("sebastien(a)qos.ch"); + + appender.start(); + + logger.addAppender(appender); + + for (int i = 0; i <= 10; i++) { + logger.debug("** Hello world. n=" + i); + } + logger.error("Triggering request"); + + StatusPrinter.print(lc.getStatusManager()); + } + + private static Layout buildLayout(LoggerContext lc) { + PatternLayout layout = new PatternLayout(); + layout.setContext(lc); + layout.setHeader("Some header\n"); + layout.setPattern("%-4relative [%thread] %-5level %class - %msg%n"); + layout.setFooter("Some footer"); + layout.start(); + return layout; + } + +}

1 0