October 2008 - logback-dev - mailman3.qos.ch

svn commit: r1835 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 18:58:23 2008 New Revision: 1835 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java Log: Under certain special circumstances (reproducible under Continuum on Linux) the callerClass computed by R.getCaller class can be null. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java Wed Oct 15 18:58:23 2008 @@ -10,7 +10,6 @@ package ch.qos.logback.classic.spi; import java.net.URL; -import java.util.Arrays; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -83,23 +82,10 @@ callerClass = Reflection.getCallerClass(localFirstCommon + i - missfireCount + 1); } - - - StackTraceElementProxy step = stepArray[stepFirstCommon + i]; String stepClassname = step.ste.getClassName(); - if (callerClass == null) { - System.out.println("***********************************"); - System.out.println("localFirstCommon=" + localFirstCommon + ", i=" + i - + ", missfireCount=" + missfireCount); - System.out.println("sum=" + (localFirstCommon + i - missfireCount + 1)); - System.out.println("stepClassname="+stepClassname); - t.printStackTrace(); - System.out.println(Arrays.toString(stepArray)); - } - - if (stepClassname.equals(callerClass.getName())) { + if (callerClass != null && stepClassname.equals(callerClass.getName())) { lastExactClassLoader = callerClass.getClassLoader(); if (firsExactClassLoader == null) { firsExactClassLoader = callerClass.getClassLoader();

1 0

svn commit: r1834 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 18:25:12 2008 New Revision: 1834 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java Log: hunting down the circumstances for NullPointerExcetions thrown in PackagingDataCalculator Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java Wed Oct 15 18:25:12 2008 @@ -10,6 +10,7 @@ package ch.qos.logback.classic.spi; import java.net.URL; +import java.util.Arrays; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -31,7 +32,7 @@ HashMap<String, ClassPackagingData> cache = new HashMap<String, ClassPackagingData>(); private static boolean GET_CALLER_CLASS_METHOD_AVAILABLE = false; - + static { // if either the Reflection class or the getCallerClass method // are unavailable, then we won't invoke Reflection.getCallerClass() @@ -41,29 +42,29 @@ try { Reflection.getCallerClass(2); GET_CALLER_CLASS_METHOD_AVAILABLE = true; - } catch(NoClassDefFoundError e) { - } catch(NoSuchMethodError e) { - } catch(Throwable e) { + } catch (NoClassDefFoundError e) { + } catch (NoSuchMethodError e) { + } catch (Throwable e) { System.err.println("Unexpected exception"); e.printStackTrace(); } } - + public PackagingDataCalculator() { } public void calculate(ThrowableDataPoint[] tdpArray) { int steStart = 0; StackTraceElementProxy[] stepArray = new StackTraceElementProxy[0]; - do { - steStart = findSTEStartIndex(tdpArray, steStart+stepArray.length); + do { + steStart = findSTEStartIndex(tdpArray, steStart + stepArray.length); stepArray = getSTEPArray(tdpArray, steStart); populateFrames(stepArray); - } while(steStart != -1); + } while (steStart != -1); } void populateFrames(StackTraceElementProxy[] stepArray) { - // in the initial part of this method we populate package informnation for + // in the initial part of this method we populate package informnation for // common stack frames final Throwable t = new Throwable("local stack reference"); final StackTraceElement[] localteSTEArray = t.getStackTrace(); @@ -74,20 +75,33 @@ ClassLoader lastExactClassLoader = null; ClassLoader firsExactClassLoader = null; - + int missfireCount = 0; for (int i = 0; i < commonFrames; i++) { Class callerClass = null; - if(GET_CALLER_CLASS_METHOD_AVAILABLE) { + if (GET_CALLER_CLASS_METHOD_AVAILABLE) { callerClass = Reflection.getCallerClass(localFirstCommon + i - - missfireCount + 1); + - missfireCount + 1); } + + + StackTraceElementProxy step = stepArray[stepFirstCommon + i]; String stepClassname = step.ste.getClassName(); + + if (callerClass == null) { + System.out.println("***********************************"); + System.out.println("localFirstCommon=" + localFirstCommon + ", i=" + i + + ", missfireCount=" + missfireCount); + System.out.println("sum=" + (localFirstCommon + i - missfireCount + 1)); + System.out.println("stepClassname="+stepClassname); + t.printStackTrace(); + System.out.println(Arrays.toString(stepArray)); + } if (stepClassname.equals(callerClass.getName())) { lastExactClassLoader = callerClass.getClassLoader(); - if(firsExactClassLoader == null) { + if (firsExactClassLoader == null) { firsExactClassLoader = callerClass.getClassLoader(); } ClassPackagingData pi = calculateByExactType(callerClass); @@ -113,8 +127,9 @@ } return -1; } - - private StackTraceElementProxy[] getSTEPArray(final ThrowableDataPoint[] tdpArray, final int from) { + + private StackTraceElementProxy[] getSTEPArray( + final ThrowableDataPoint[] tdpArray, final int from) { List<StackTraceElementProxy> stepList = new LinkedList<StackTraceElementProxy>(); int len = tdpArray.length; if (from < 0 || from >= len) { @@ -131,9 +146,10 @@ } return stepList.toArray(STEP_ARRAY_TEMPLATE); } - - void populateUncommonFrames(int commonFrames, StackTraceElementProxy[] stepArray, ClassLoader firstExactClassLoader) { - int uncommonFrames = stepArray.length-commonFrames; + + void populateUncommonFrames(int commonFrames, + StackTraceElementProxy[] stepArray, ClassLoader firstExactClassLoader) { + int uncommonFrames = stepArray.length - commonFrames; for (int i = 0; i < uncommonFrames; i++) { StackTraceElementProxy step = stepArray[i]; ClassPackagingData pi = computeBySTEP(step, firstExactClassLoader); @@ -154,7 +170,8 @@ return cpd; } - private ClassPackagingData computeBySTEP(StackTraceElementProxy step, ClassLoader lastExactClassLoader) { + private ClassPackagingData computeBySTEP(StackTraceElementProxy step, + ClassLoader lastExactClassLoader) { String className = step.ste.getClassName(); ClassPackagingData cpd = cache.get(className); if (cpd != null) { @@ -167,8 +184,7 @@ cache.put(className, cpd); return cpd; } - - + String getImplementationVersion(Class type) { Package aPackage = type.getPackage(); if (aPackage != null) { @@ -192,7 +208,7 @@ String locationStr = resource.toString(); // now lets remove all but the file name String result = getCodeLocation(locationStr, '/'); - if(result != null) { + if (result != null) { return result; } return getCodeLocation(locationStr, '\\'); @@ -203,13 +219,12 @@ } return "na"; } - private String getCodeLocation(String locationStr, char separator) { int idx = locationStr.lastIndexOf(separator); - if(isFolder(idx, locationStr)) { - idx = locationStr.lastIndexOf(separator, idx-1); - return locationStr.substring(idx+1); + if (isFolder(idx, locationStr)) { + idx = locationStr.lastIndexOf(separator, idx - 1); + return locationStr.substring(idx + 1); } else if (idx > 0) { return locationStr.substring(idx + 1); } @@ -217,48 +232,50 @@ } private boolean isFolder(int idx, String text) { - return (idx != -1 && idx+1 == text.length()); + return (idx != -1 && idx + 1 == text.length()); } - + private Class loadClass(ClassLoader cl, String className) { - if(cl == null) { + if (cl == null) { return null; } try { return cl.loadClass(className); } catch (ClassNotFoundException e1) { return null; - } catch(Exception e) { + } catch (Exception e) { e.printStackTrace(); // this is unexpected return null; } - + } - + /** * - * @param lastGuaranteedClassLoader may be null + * @param lastGuaranteedClassLoader + * may be null * @param className * @return */ - private Class bestEffortLoadClass(ClassLoader lastGuaranteedClassLoader, String className) { + private Class bestEffortLoadClass(ClassLoader lastGuaranteedClassLoader, + String className) { Class result = loadClass(lastGuaranteedClassLoader, className); - if(result != null) { + if (result != null) { return result; } ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - if(tccl != lastGuaranteedClassLoader) { + if (tccl != lastGuaranteedClassLoader) { result = loadClass(tccl, className); } - if(result != null) { + if (result != null) { return result; } - + try { return Class.forName(className); } catch (ClassNotFoundException e1) { return null; - } catch(Exception e) { + } catch (Exception e) { e.printStackTrace(); // this is unexpected return null; }

1 0

svn commit: r1833 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 17:39:29 2008 New Revision: 1833 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java Log: Better error reporting during the creation of Converter from the custom converter registry Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java Wed Oct 15 17:39:29 2008 @@ -19,14 +19,13 @@ import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.util.OptionHelper; - class Compiler<E> extends ContextAwareBase { Converter<E> head; Converter<E> tail; final Node top; final Map converterMap; - + Compiler(final Node top, final Map converterMap) { this.top = top; this.converterMap = converterMap; @@ -43,7 +42,8 @@ CompositeNode cn = (CompositeNode) n; CompositeConverter<E> compositeConverter = new CompositeConverter<E>(); compositeConverter.setFormattingInfo(cn.getFormatInfo()); - Compiler<E> childCompiler = new Compiler<E>(cn.getChildNode(), converterMap); + Compiler<E> childCompiler = new Compiler<E>(cn.getChildNode(), + converterMap); childCompiler.setContext(context); Converter<E> childConverter = childCompiler.compile(); compositeConverter.setChildConverter(childConverter); @@ -61,7 +61,8 @@ // it with a dummy LiteralConverter indicating an error. Converter<E> errConveter = new LiteralConverter<E>("%PARSER_ERROR_" + kn.getValue()); - addStatus(new ErrorStatus("["+kn.getValue()+"] is not a valid conversion word", this)); + addStatus(new ErrorStatus("[" + kn.getValue() + + "] is not a valid conversion word", this)); addToList(errConveter); } @@ -79,9 +80,10 @@ } } - /** - * Attempt to create a converter using the information found in 'converterMap'. + * Attempt to create a converter using the information found in + * 'converterMap'. + * * @param kn * @return */ @@ -90,26 +92,29 @@ String keyword = (String) kn.getValue(); String converterClassStr = (String) converterMap.get(keyword); - // FIXME: Better error handling if (converterClassStr != null) { try { return (DynamicConverter) OptionHelper.instantiateByClassName( converterClassStr, DynamicConverter.class, context); } catch (Exception e) { + addError("Failed to instantiate converter class [" + converterClassStr + + "]", e); return null; } } else { + addError("There is no conversion class registered for conversion word [" + + keyword + "]"); return null; } } -// public void setStatusManager(StatusManager statusManager) { -// this.statusManager = statusManager; -// } -// -// void addStatus(Status status) { -// if(statusManager != null) { -// statusManager.add(status); -// } -// } + // public void setStatusManager(StatusManager statusManager) { + // this.statusManager = statusManager; + // } + // + // void addStatus(Status status) { + // if(statusManager != null) { + // statusManager.add(status); + // } + // } } \ No newline at end of file

1 0

svn commit: r1832 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action
by noreply.ceki＠qos.ch 15 Oct '08

15 Oct '08

Author: ceki Date: Wed Oct 15 17:33:04 2008 New Revision: 1832 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java Log: - generate a status entry when a conversion word is registered Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ConversionRuleAction.java Wed Oct 15 17:33:04 2008 @@ -56,19 +56,14 @@ } try { - //getLogger().debug( - // "About to add conversion rule [{}, {}] to layout", conversionWord, converterClass); - - //LoggerRepository repository = (LoggerRepository) ec.getObjectStack().get(0); - Map<String, String> ruleRegistry = (Map) context.getObject(CoreGlobal.PATTERN_RULE_REGISTRY); if(ruleRegistry == null) { ruleRegistry = new HashMap<String, String>(); context.putObject(CoreGlobal.PATTERN_RULE_REGISTRY, ruleRegistry); } // put the new rule into the rule registry + addInfo("registering conversion word "+conversionWord+" with class ["+converterClass+"]"); ruleRegistry.put(conversionWord, converterClass); - } catch (Exception oops) { inError = true; errorMsg = "Could not add conversion rule to PatternLayout.";

1 0

[JIRA] Commented: (LBCORE-15) Problems getting autogenerated Keys in Oracle with Oracle JDBC 10.2.03
by Søren Boisen (JIRA) 15 Oct '08

15 Oct '08

[ http://jira.qos.ch/browse/LBCORE-15?page=com.atlassian.jira.plugin.system.i… ] Søren Boisen commented on LBCORE-15: ------------------------------------ It's important to note that the original suggestion, to use prepareStatement(String, int) will not work. In this case Oracle will return the ROWID of the inserted row instead of the EVENT_ID column. As John Gibson wrote, prepareStatement(String, String[]) should be used instead, specifying EVENT_ID as the name of the column to be returned. For other people that cannot wait for this bug to be fixed, a workaround is to write your own class extending DBAppender: public class OracleDBAppender extends DBAppender { @Override public void append (LoggingEvent eventObject) { Connection connection = null; try { connection = connectionSource.getConnection(); connection.setAutoCommit(false); PreparedStatement insertStatement = connection.prepareStatement( getInsertSQL(), new String[] {"EVENT_ID"}); subAppend(eventObject, connection, insertStatement); // we no longer need the insertStatement if (insertStatement != null) { insertStatement.close(); insertStatement = null; } connection.commit(); } catch (Throwable sqle) { addError("problem appending event", sqle); } finally { DBHelper.closeConnection(connection); } } } Then in your configuration file simply declare the class of the appender to attach as your new OracleDBAppender class. > Problems getting autogenerated Keys in Oracle with Oracle JDBC 10.2.03 > ---------------------------------------------------------------------- > > Key: LBCORE-15 > URL: http://jira.qos.ch/browse/LBCORE-15 > Project: logback-core > Issue Type: Bug > Components: Appender > Affects Versions: unspecified > Environment: Operating System: Windows > Platform: PC > Reporter: Klaus Unger > Assignee: Logback dev list > Priority: Blocker > > I've encountered troubles logging StackTrace/MDC entries with die DBAppender on our plattform! We are using Oracle 9.2.0.6.0 on a Solaris Box with Oracle JDBC Driver 10.2.0.3! > I've debugged the processing of LogMessages into DBAppenderBase.append()! > There I found a call "con.prepareStatement(getInsertSQL())" which is followed by a call "subAppend(...)" > As far as I understand Oracle Drivers return generatedKeys only, if you use the right prepareStatement() methods, which is in my understanding the following: > PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) > throws SQLException > @see http://java.sun.com/j2se/1.5.0/docs/api/java/sql/Connection.html#prepareSta… > which is available since JDK 1.4 -- 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

1 0

svn commit: r1831 - in logback/trunk: logback-classic/src/test/java/ch/qos/logback/classic/net logback-core/src/main/java/ch/qos/logback/core/net logback-examples/src/main/java/chapter4/mail logback-site/src/site/pages logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 14 Oct '08

14 Oct '08

Author: ceki Date: Wed Oct 15 00:45:06 2008 New Revision: 1831 Added: logback/trunk/logback-examples/src/main/java/chapter4/mail/gmailSSL.xml logback/trunk/logback-examples/src/main/java/chapter4/mail/gmailSTARTTLS.xml Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java logback/trunk/logback-site/src/site/pages/manual/appenders.html logback/trunk/logback-site/src/site/pages/news.html Log: LBCORE-17 Added documentation and test cases for STARTTLS and SSL support. Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java Wed Oct 15 00:45:06 2008 @@ -234,7 +234,7 @@ MessageListenerAdapter mla = (MessageListenerAdapter)wiser.getServer().getMessageHandlerFactory(); mla.setAuthenticationHandlerFactory(new TrivialAuthHandlerFactory()); - smtpAppender.setStartTLS(true); + smtpAppender.setSTARTTLS(true); smtpAppender.setUsername("xx"); smtpAppender.setPassword("xx"); @@ -259,7 +259,7 @@ smtpAppender.setSMTPPort(587); smtpAppender.addTo("XXX(a)gmail.com"); - smtpAppender.setStartTLS(true); + smtpAppender.setSTARTTLS(true); smtpAppender.setUsername("XXX(a)gmail.com"); smtpAppender.setPassword("XXX"); @@ -280,7 +280,7 @@ smtpAppender.setSMTPPort(465); smtpAppender.addTo("XXX(a)gmail.com"); - smtpAppender.setSsl(true); + smtpAppender.setSSL(true); smtpAppender.setUsername("XXX(a)gmail.com"); smtpAppender.setPassword("XXX"); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java Wed Oct 15 00:45:06 2008 @@ -58,7 +58,7 @@ private String subjectStr = null; private String smtpHost; private int smtpPort = 25; - private boolean startTLS = false; + private boolean starttls = false; private boolean ssl = false; String username; @@ -96,14 +96,14 @@ props.put("mail.smtp.auth", "true"); } - if (isStartTLS() && isSsl()) { + if (isSTARTTLS() && isSSL()) { addError("Both SSL and StartTLS cannot be enabled simultaneously"); } else { - if (isStartTLS()) { + if (isSTARTTLS()) { props.setProperty("mail.smtp.auth", "true"); props.put("mail.smtp.starttls.enable", "true"); } - if (isSsl()) { + if (isSSL()) { String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory"; props.put("mail.smtp.socketFactory.port", Integer.toString(smtpPort)); props.put("mail.smtp.socketFactory.class", SSL_FACTORY); @@ -358,19 +358,19 @@ this.msg = msg; } - public boolean isStartTLS() { - return startTLS; + public boolean isSTARTTLS() { + return starttls; } - public void setStartTLS(boolean startTLS) { - this.startTLS = startTLS; + public void setSTARTTLS(boolean startTLS) { + this.starttls = startTLS; } - public boolean isSsl() { + public boolean isSSL() { return ssl; } - public void setSsl(boolean ssl) { + public void setSSL(boolean ssl) { this.ssl = ssl; } Added: logback/trunk/logback-examples/src/main/java/chapter4/mail/gmailSSL.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-examples/src/main/java/chapter4/mail/gmailSSL.xml Wed Oct 15 00:45:06 2008 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender"> + <SMTPHost>smtp.gmail.com</SMTPHost> + <SMTPPort>465</SMTPPort> + <SSL>true</SSL> + <Username>USERNAME</Username> + <Password>PASSWORD</Password> + + + <To>EMAIL-DESTINATION</To> + <To>ANOTHER_EMAIL_DESTINATION</To>  + <From>SENDER-EMAIL</From> + <Subject>TESTING: %logger{20} - %m</Subject> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%date %-5level %logger - %message%n</Pattern> + </layout> + </appender> + + <root> + <level value="debug"/> + <appender-ref ref="EMAIL" /> + </root> +</configuration> Added: logback/trunk/logback-examples/src/main/java/chapter4/mail/gmailSTARTTLS.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-examples/src/main/java/chapter4/mail/gmailSTARTTLS.xml Wed Oct 15 00:45:06 2008 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<configuration> + + <appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender"> + <SMTPHost>smtp.gmail.com</SMTPHost> + <SMTPPort>587</SMTPPort> + <STARTTLS>true</STARTTLS> + <Username>USERNAME</Username> + <Password>PASSWORD</Password> + + <To>EMAIL-DESTINATION</To> + <To>ANOTHER_EMAIL_DESTINATION</To>  + <From>SENDER-EMAIL</From> + <Subject>TESTING: %logger{20} - %m</Subject> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%date %-5level %logger - %message%n</Pattern> + </layout> + </appender> + + <root> + <level value="debug"/> + <appender-ref ref="EMAIL" /> + </root> +</configuration> Modified: logback/trunk/logback-site/src/site/pages/manual/appenders.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/appenders.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/appenders.html Wed Oct 15 00:45:06 2008 @@ -1920,14 +1920,14 @@ <td><code>String</code></td> <td>The host name of the SMTP server. This parameter is mandatory.</td> </tr> - + <tr class="alt"> <td>SMTPPort</td> <td><code>int</code></td> <td>The port where the SMTP server is listening. Defaults to 25.</td> </tr> - + <tr> <td>To</td> <td><code>String</code></td> @@ -1964,46 +1964,79 @@ By default, this option is set to "%logger{20} - %m". - </td> - </tr> - <tr class="alt"> - <td>BufferSize</td> - <td><code>int</code></td> - <td> - The BufferSize option takes a positive - integer representing the maximum number of logging events to collect in a - cyclic buffer. When the BufferSize is reached, - oldest events are deleted as new events are added to the buffer. - The default size of the cyclic buffer is 512. - </td> - </tr> - <tr > - <td>Evaluator</td> - <td><code>String</code></td> - <td> - This option is declared by creating a new <code><EventEvaluator/></code> - element. The name of the class that the user wishes to use as the - <code>SMTPAppender</code>'s <code>Evaluator</code> can be given - by adding an attribute to the newly created element. - - - More details about the use of event evaluators with - <code>SMTPAppender</code> follow further down this document. - - - In the absence of this option, <code>SMTPAppender</code> is - assigned a default event evaluator which triggers email - transmission as a response to any event of level - ERROR or higher. - - - <code>EventEvaluator</code> objects are subclasses of the - <code>JaninoEventEvaluatorBase</code> which depends on - Janino. See the <a href="../dependencies.html">dependencies - page</a> for more information. - - </td> - </tr> + </td> + </tr> + <tr class="alt"> + <td>BufferSize</td> + <td><code>int</code></td> + <td> + The BufferSize option takes a positive + integer representing the maximum number of logging events to collect in a + cyclic buffer. When the BufferSize is reached, + oldest events are deleted as new events are added to the buffer. + The default size of the cyclic buffer is 512. + </td> + </tr> + <tr > + <td>Evaluator</td> + <td><code>String</code></td> + <td> + This option is declared by creating a new <code><EventEvaluator/></code> + element. The name of the class that the user wishes to use as the + <code>SMTPAppender</code>'s <code>Evaluator</code> can be given + by adding an attribute to the newly created element. + + + More details about the use of event evaluators with + <code>SMTPAppender</code> follow further down this document. + + + In the absence of this option, <code>SMTPAppender</code> is + assigned a default event evaluator which triggers email + transmission as a response to any event of level + ERROR or higher. + + + <code>EventEvaluator</code> objects are subclasses of the + <code>JaninoEventEvaluatorBase</code> which depends on + Janino. See the <a href="../dependencies.html">dependencies + page</a> for more information. + + </td> + </tr> + <tr class="alt"> + <td>Username</td> + <td><code>String</code></td> + <td>The username value to use during plain user/password + authentication. By default, this parameter is null. + </td> + </tr> + <tr > + <td>Password</td> + <td><code>String</code></td> + <td>The password value to use for plain user/password + authentication. By default, this parameter is null. + </td> + </tr> + <tr class="alt"> + <td>STARTTLS</td> + <td><code>boolean</code></td> + <td>If this parameter is set to true, then this appender will + issue the STARTTLS command (if the server supports it) causing + the connection to switch to SSL. Note that the connection is + initally non-encrypted. By default, this parameter is set to + false. + </td> + </tr> + <tr > + <td>SSL</td> + <td><code>boolean</code></td> + <td>If this parameter is set to true, then this appender will + open an SSL conneciton to the server. By default, this + parameter is set to false. + </td> + </tr> + </table> The SMTPAppender keeps only the last </configuration></pre></div> + + <h3>Authentication/STARTTLS/SSL</h3> + + SMTPAppender supports plain user/password authentication as + well as both STARTTLS and SSL. + + + The next example shows you how to configure SMTPAppender for + gmail with SSL. + +Example 4.13: <code>SMTPAppender</code> to GMAIL using SSL (logback-examples/src/main/java/chapter4/mail/gmailSSL.xml) + +<div class="source"><pre><configuration> + <appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender"> + <SMTPHost>smtp.gmail.com</SMTPHost> + <SMTPPort>465</SMTPPort> + <SSL>true</SSL> + <Username>USERNAME(a)gmail.com</Username> + <Password>PASSWORD</Password> + <To>${to}</To> + <From>${from}</From> + <layout class="ch.qos.logback.classic.html.HTMLLayout"/> + </appender> + + <root> + <level value ="debug"/> + <appender-ref ref="EMAIL" /> + </root> +</configuration></pre></div> + + For a STARTTLS with gmail refer to the configuration file + logback-examples/src/main/java/chapter4/mail/gmailSTARTTLS.xml) + + <a name="DBAppender"></a> <h3>DBAppender</h3> - - The <a href="../xref/ch/qos/logback/classic/db/DBAppender.html"><code>DBAppender</code></a> - inserts loggin events into three database tables in a format - independent of the Java programming language. - - - These three tables are logging_event, logging_event_property and - logging_event_exception. They all must exist before <code>DBAppender</code> - can be used. Logback ships with SQL scripts that will create the tables. - They can be found in the found in the - logback-classic/src/main/java/ch/qos/logback/classic/db/dialect directory. There - is a specific script for each of the most popular database systems. - If the script for your particular type of database system is missing, it should be - quite easy to write one, taking example on the already existing scripts. If - you send them to us, we will gladly include missing scripts in future releases. + The <a + href="../xref/ch/qos/logback/classic/db/DBAppender.html"><code>DBAppender</code></a> + inserts loggin events into three database tables in a format + independent of the Java programming language. + + + These three tables are logging_event, + logging_event_property and + logging_event_exception. They all must exist before + <code>DBAppender</code> can be used. Logback ships with SQL + scripts that will create the tables. They can be found in the + found in the + logback-classic/src/main/java/ch/qos/logback/classic/db/dialect + directory. There is a specific script for each of the most popular + database systems. If the script for your particular type of + database system is missing, it should be quite easy to write one, + taking example on the already existing scripts. If you send them + to us, we will gladly include missing scripts in future releases. Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Wed Oct 15 00:45:06 2008 @@ -81,7 +81,6 @@ - Fixed issue <a href="http://jira.qos.ch/browse/LBCORE-27">LBCORE-27</a> reported by Peter Royal. SMTPAppender now outputs its presentation footer and @@ -110,6 +109,13 @@ Fixed issue <a href="http://jira.qos.ch/browse/LBGENERAL-24">LBGENERAL-24</a> + reported by Hung Tang. SMTPAppender now supports plain + username/password authentication as well as both the STARTTLS + command and SSL connections. + + + Fixed issue <a + href="http://jira.qos.ch/browse/LBCORE-17">LBCORE-17</a> reported by Thorbjørn Ravn Andersen. Logback now relies on Geronimo JMS API specifications instead of Sun's JMS API specification, the latter requiring manual installation. With @@ -117,7 +123,6 @@ manually install any dependencies. - <a href="http://jira.qos.ch/browse/LBCORE-32">LBCORE-32</a>

1 0

[JIRA] Resolved: (LBCORE-17) SMTPAppenderBase: authentication options request
by Ceki Gulcu (JIRA) 14 Oct '08

14 Oct '08

[ http://jira.qos.ch/browse/LBCORE-17?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu resolved LBCORE-17. ------------------------------ Fix Version/s: 0.9.10 Resolution: Fixed Fixed. Added support for plain user password authentication. Furthermore, support for both STARTTLS and SSL connections were added. Note that STARTTLS differs from SSL in that, in STARTTLS, the connection is non-encrypted in the beginning and only after the STARTTLS command is issued by the client (if the server supports it) does the connection switch to SSL. In SSL mode, the connection is SSL from the start. > SMTPAppenderBase: authentication options request > ------------------------------------------------ > > Key: LBCORE-17 > URL: http://jira.qos.ch/browse/LBCORE-17 > Project: logback-core > Issue Type: Bug > Components: Appender > Affects Versions: unspecified > Environment: Operating System: All > Platform: PC > URL: http://www.nabble.com/Re%3A-SMTPAppender%3A-authentication-option-missing--… > Reporter: Hung Tang > Assignee: Logback dev list > Priority: Blocker > Fix For: 0.9.10 > > > I'm trying to use the SMTPAppender but my SMTP server requires that I authenticate, and it appears that SMTPAppenderBase do not provide the necessary authentication options. > I also notice that SMTPAppenderBase uses Transport.send(), and no where does it use transport.connect(...) that accepts username and password. -- 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

1 0

svn commit: r1830 - in logback/trunk: logback-classic logback-classic/src/test/java/ch/qos/logback/classic/net logback-core/src/main/java/ch/qos/logback/core/net
by noreply.ceki＠qos.ch 14 Oct '08

14 Oct '08

Author: ceki Date: Wed Oct 15 00:03:28 2008 New Revision: 1830 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/LoginAuthenticator.java Modified: logback/trunk/logback-classic/pom.xml logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java Log: LBCORE-17 Added support for plain user password authentication. Furthermore, support for both STARTTLS and SSL connections were added. Note that STARTTLS differs from SSL in that, in STARTTLS, the connection is non-encrypted in the beginning and only after the STARTTLS command is issued by the client (if the server supports it) does the connection switch to SSL. In SSL mode, the connection is SSL from the start. Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Wed Oct 15 00:03:28 2008 @@ -100,10 +100,6 @@ <optional>true</optional> </dependency> - - - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -118,6 +114,18 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.subethamail</groupId> + <artifactId>subethasmtp</artifactId> + <version>2.1.0</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java Wed Oct 15 00:03:28 2008 @@ -0,0 +1,314 @@ +package ch.qos.logback.classic.net; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.ByteArrayOutputStream; +import java.util.List; +import java.util.Random; + +import javax.mail.Part; +import javax.mail.internet.MimeMessage; +import javax.mail.internet.MimeMultipart; + +import org.dom4j.io.SAXReader; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.subethamail.smtp.AuthenticationHandler; +import org.subethamail.smtp.AuthenticationHandlerFactory; +import org.subethamail.smtp.auth.LoginAuthenticationHandler; +import org.subethamail.smtp.auth.LoginFailedException; +import org.subethamail.smtp.auth.PlainAuthenticationHandler; +import org.subethamail.smtp.auth.PluginAuthenticationHandler; +import org.subethamail.smtp.auth.UsernamePasswordValidator; +import org.subethamail.smtp.server.MessageListenerAdapter; +import org.subethamail.wiser.Wiser; +import org.subethamail.wiser.WiserMessage; + +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.PatternLayout; +import ch.qos.logback.classic.html.HTMLLayout; +import ch.qos.logback.classic.html.XHTMLEntityResolver; +import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.CoreGlobal; +import ch.qos.logback.core.Layout; +import ch.qos.logback.core.util.StatusPrinter; + +public class SMTPAppender_SubethaSMTPTest { + + int diff = 1024 + new Random().nextInt(10000); + Wiser wiser; + + SMTPAppender smtpAppender; + LoggerContext lc = new LoggerContext(); + + static final String TEST_SUBJECT = "test subject"; + static final String HEADER = "HEADER\n"; + static final String FOOTER = "FOOTER\n"; + + @Before + public void setUp() throws Exception { + wiser = new Wiser(); + wiser.setPort(diff); + wiser.getServer(); + wiser.start(); + //StartTLSCommand s; + buildSMTPAppender(); + } + + void buildSMTPAppender() throws Exception { + smtpAppender = new SMTPAppender(); + smtpAppender.setContext(lc); + smtpAppender.setName("smtp"); + smtpAppender.setFrom("user(a)host.dom"); + smtpAppender.setSMTPHost("localhost"); + smtpAppender.setSMTPPort(diff); + smtpAppender.setSubject(TEST_SUBJECT); + smtpAppender.addTo("noreply(a)qos.ch"); + } + + private Layout<LoggingEvent> buildPatternLayout(LoggerContext lc) { + PatternLayout layout = new PatternLayout(); + layout.setContext(lc); + layout.setFileHeader(HEADER); + layout.setPattern("%-4relative [%thread] %-5level %logger %class - %msg%n"); + layout.setFileFooter(FOOTER); + layout.start(); + return layout; + } + + private Layout<LoggingEvent> buildHTMLLayout(LoggerContext lc) { + HTMLLayout layout = new HTMLLayout(); + layout.setContext(lc); + // layout.setFileHeader(HEADER); + layout.setPattern("%level%class%msg"); + // layout.setFileFooter(FOOTER); + layout.start(); + return layout; + } + + @After + public void tearDown() throws Exception { + } + + private static String getWholeMessage(Part msg) { + try { + ByteArrayOutputStream bodyOut = new ByteArrayOutputStream(); + msg.writeTo(bodyOut); + return bodyOut.toString("US-ASCII").trim(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private static String getBody(Part msg) { + String all = getWholeMessage(msg); + int i = all.indexOf("\r\n\r\n"); + return all.substring(i + 4, all.length()); +} + + @Test + public void smoke() throws Exception { + smtpAppender.setLayout(buildPatternLayout(lc)); + smtpAppender.start(); + Logger logger = lc.getLogger("test"); + logger.addAppender(smtpAppender); + logger.debug("hello"); + logger.error("en error", new Exception("an exception")); + List<WiserMessage> wiserMsgList = wiser.getMessages(); + + assertNotNull(wiserMsgList); + assertEquals(1, wiserMsgList.size()); + WiserMessage wm = wiserMsgList.get(0); + // http://jira.qos.ch/browse/LBCLASSIC-67 + MimeMessage mm = wm.getMimeMessage(); + assertEquals(TEST_SUBJECT, mm.getSubject()); + + MimeMultipart mp = (MimeMultipart) mm.getContent(); + String body = getBody(mp.getBodyPart(0)); + System.out.println("["+body); + assertTrue(body.startsWith(HEADER.trim())); + assertTrue(body.endsWith(FOOTER.trim())); + } + + @Test + public void html() throws Exception { + smtpAppender.setLayout(buildHTMLLayout(lc)); + smtpAppender.start(); + Logger logger = lc.getLogger("test"); + logger.addAppender(smtpAppender); + logger.debug("hello"); + logger.error("en error", new Exception("an exception")); + + List<WiserMessage> wiserMsgList = wiser.getMessages(); + + assertNotNull(wiserMsgList); + assertEquals(1, wiserMsgList.size()); + WiserMessage wm = wiserMsgList.get(0); + MimeMessage mm = wm.getMimeMessage(); + assertEquals(TEST_SUBJECT, mm.getSubject()); + + MimeMultipart mp = (MimeMultipart) mm.getContent(); + + // verify strict adherence to xhtml1-strict.dtd + SAXReader reader = new SAXReader(); + reader.setValidation(true); + reader.setEntityResolver(new XHTMLEntityResolver()); + reader.read(mp.getBodyPart(0).getInputStream()); + // System.out.println(GreenMailUtil.getBody(mp.getBodyPart(0))); + } + + @Test + /** + * Checks that even when many events are processed, the output is still + * conforms to xhtml-strict.dtd. + * + * Note that SMTPAppender only keeps only 500 or so (=buffer size) events. So + * the generated output will be rather short. + */ + public void htmlLong() throws Exception { + smtpAppender.setLayout(buildHTMLLayout(lc)); + smtpAppender.start(); + Logger logger = lc.getLogger("test"); + logger.addAppender(smtpAppender); + for (int i = 0; i < CoreGlobal.TABLE_ROW_LIMIT * 3; i++) { + logger.debug("hello " + i); + } + logger.error("en error", new Exception("an exception")); + List<WiserMessage> wiserMsgList = wiser.getMessages(); + + assertNotNull(wiserMsgList); + assertEquals(1, wiserMsgList.size()); + WiserMessage wm = wiserMsgList.get(0); + MimeMessage mm = wm.getMimeMessage(); + assertEquals(TEST_SUBJECT, mm.getSubject()); + + MimeMultipart mp = (MimeMultipart) mm.getContent(); + + // verify strict adherence to xhtml1-strict.dtd + SAXReader reader = new SAXReader(); + reader.setValidation(true); + reader.setEntityResolver(new XHTMLEntityResolver()); + reader.read(mp.getBodyPart(0).getInputStream()); + } + + @Test + public void authenticated() throws Exception { + MessageListenerAdapter mla = (MessageListenerAdapter)wiser.getServer().getMessageHandlerFactory(); + mla.setAuthenticationHandlerFactory(new TrivialAuthHandlerFactory()); + + smtpAppender.setUsername("x"); + smtpAppender.setPassword("x"); + + smtpAppender.setLayout(buildPatternLayout(lc)); + smtpAppender.start(); + Logger logger = lc.getLogger("test"); + logger.addAppender(smtpAppender); + logger.debug("hello"); + logger.error("en error", new Exception("an exception")); + + List<WiserMessage> wiserMsgList = wiser.getMessages(); + + assertNotNull(wiserMsgList); + assertEquals(1, wiserMsgList.size()); + WiserMessage wm = wiserMsgList.get(0); + // http://jira.qos.ch/browse/LBCLASSIC-67 + MimeMessage mm = wm.getMimeMessage(); + assertEquals(TEST_SUBJECT, mm.getSubject()); + + MimeMultipart mp = (MimeMultipart) mm.getContent(); + String body = getBody(mp.getBodyPart(0)); + assertTrue(body.startsWith(HEADER.trim())); + assertTrue(body.endsWith(FOOTER.trim())); + } + + @Test + @Ignore + // Unfortunately, there seems to be a problem with SubethaSMTP's implementation + // of startTLS. The same SMTPAppender code works fine when tested with gmail. + public void authenticatedSSL() throws Exception { + MessageListenerAdapter mla = (MessageListenerAdapter)wiser.getServer().getMessageHandlerFactory(); + mla.setAuthenticationHandlerFactory(new TrivialAuthHandlerFactory()); + + smtpAppender.setStartTLS(true); + smtpAppender.setUsername("xx"); + smtpAppender.setPassword("xx"); + + smtpAppender.setLayout(buildPatternLayout(lc)); + smtpAppender.start(); + Logger logger = lc.getLogger("test"); + logger.addAppender(smtpAppender); + logger.debug("hello"); + logger.error("en error", new Exception("an exception")); + + StatusPrinter.print(lc); + List<WiserMessage> wiserMsgList = wiser.getMessages(); + + assertNotNull(wiserMsgList); + assertEquals(1, wiserMsgList.size()); + } + + @Test + @Ignore + public void authenticatedGmailStartTLS() throws Exception { + smtpAppender.setSMTPHost("smtp.gmail.com"); + smtpAppender.setSMTPPort(587); + + smtpAppender.addTo("XXX(a)gmail.com"); + smtpAppender.setStartTLS(true); + smtpAppender.setUsername("XXX(a)gmail.com"); + smtpAppender.setPassword("XXX"); + + smtpAppender.setLayout(buildPatternLayout(lc)); + smtpAppender.start(); + Logger logger = lc.getLogger("authenticatedGmailSTARTTLS"); + logger.addAppender(smtpAppender); + logger.debug("hello"); + logger.error("en error", new Exception("an exception")); + + StatusPrinter.print(lc); + } + + @Test + @Ignore + public void authenticatedGmail_SSL() throws Exception { + smtpAppender.setSMTPHost("smtp.gmail.com"); + smtpAppender.setSMTPPort(465); + + smtpAppender.addTo("XXX(a)gmail.com"); + smtpAppender.setSsl(true); + smtpAppender.setUsername("XXX(a)gmail.com"); + smtpAppender.setPassword("XXX"); + + smtpAppender.setLayout(buildPatternLayout(lc)); + smtpAppender.start(); + Logger logger = lc.getLogger("authenticatedGmail_SSL"); + logger.addAppender(smtpAppender); + logger.debug("hello"); + logger.error("en error", new Exception("an exception")); + + StatusPrinter.print(lc); + } + + public class TrivialAuthHandlerFactory implements AuthenticationHandlerFactory { + public AuthenticationHandler create() { + PluginAuthenticationHandler ret = new PluginAuthenticationHandler(); + UsernamePasswordValidator validator = new UsernamePasswordValidator() { + public void login(String username, String password) + throws LoginFailedException { + if(!username.equals(password)) { + throw new LoginFailedException("username="+username+", password="+password); + } + } + }; + ret.addPlugin(new PlainAuthenticationHandler(validator)); + ret.addPlugin(new LoginAuthenticationHandler(validator)); + return ret; + } + } + +} Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/LoginAuthenticator.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/LoginAuthenticator.java Wed Oct 15 00:03:28 2008 @@ -0,0 +1,20 @@ +package ch.qos.logback.core.net; + +import javax.mail.Authenticator; +import javax.mail.PasswordAuthentication; + +public class LoginAuthenticator extends Authenticator { + + String username; + String password; + + LoginAuthenticator(String username, String password) { + this.username = username; + this.password = password; + } + + public PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); +} + +} Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java Wed Oct 15 00:03:28 2008 @@ -32,15 +32,24 @@ import ch.qos.logback.core.boolex.EventEvaluator; /** - * An abstract class that provides basic support for sending events to an email + * An abstract class that provides support for sending events to an email * address. * + * + * Authentication through plain user password is supported. Both STARTTLS and SSL are + * also supported. Note that STARTTLS differs from SSL in that, in STARTTLS, the connection + * is non-encrypted and only after the STARTTLS command is issued by the client + * (if the server supports it) does the connection switch to SSL. In SSL mode, the connection + * is SSL from the start. + * * @author Ceki Gülcü * @author Sébastien Pennec * */ public abstract class SMTPAppenderBase<E> extends AppenderBase<E> { + // private final String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory"; + protected Layout<E> layout; protected Layout<E> subjectLayout; @@ -49,7 +58,12 @@ private String subjectStr = null; private String smtpHost; private int smtpPort = 25; - + private boolean startTLS = false; + private boolean ssl = false; + + String username; + String password; + protected Message msg; protected EventEvaluator eventEvaluator; @@ -74,10 +88,32 @@ props.put("mail.smtp.host", smtpHost); } props.put("mail.smtp.port", Integer.toString(smtpPort)); + + LoginAuthenticator loginAuthenticator = null; + + if (username != null) { + loginAuthenticator = new LoginAuthenticator(username, password); + props.put("mail.smtp.auth", "true"); + } + + if (isStartTLS() && isSsl()) { + addError("Both SSL and StartTLS cannot be enabled simultaneously"); + } else { + if (isStartTLS()) { + props.setProperty("mail.smtp.auth", "true"); + props.put("mail.smtp.starttls.enable", "true"); + } + if (isSsl()) { + String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory"; + props.put("mail.smtp.socketFactory.port", Integer.toString(smtpPort)); + props.put("mail.smtp.socketFactory.class", SSL_FACTORY); + props.put("mail.smtp.socketFactory.fallback", "true"); + } + } + + // props.put("mail.debug", "true"); - - Session session = Session.getInstance(props, null); - // session.setDebug(true); + Session session = Session.getInstance(props, loginAuthenticator); msg = new MimeMessage(session); try { @@ -131,10 +167,11 @@ */ public boolean checkEntryConditions() { if (!this.started) { - addError("Attempting to append to a non-started appender: " + this.getName()); + addError("Attempting to append to a non-started appender: " + + this.getName()); return false; } - + if (this.msg == null) { addError("Message object not configured."); return false; @@ -174,7 +211,7 @@ for (int i = 0; i < addressList.size(); i++) { try { InternetAddress[] tmp = InternetAddress.parse(addressList.get(i), true); - //one <To> element should contain one email address + // one <To> element should contain one email address iaArray[i] = tmp[0]; } catch (AddressException e) { addError("Could not parse address [" + addressList.get(i) + "].", e); @@ -221,7 +258,6 @@ if (footer != null) { sbuf.append(footer); } - if (subjectLayout != null) { msg.setSubject(subjectLayout.doLayout(lastEventObject)); @@ -288,14 +324,14 @@ } /** - * The port where the SMTP server is running. Default value is 25. + * The port where the SMTP server is running. Default value is 25. * * @param port */ public void setSMTPPort(int port) { this.smtpPort = port; } - + /** * @see #setSMTPPort(int) * @return @@ -303,10 +339,10 @@ public int getSMTPPort() { return smtpPort; } - + /** - * The To option takes a string value which should be - * an e-mail address of one of the recipients. + * The To option takes a string value which should be an e-mail + * address of one of the recipients. */ public void addTo(String to) { this.to.add(to); @@ -322,6 +358,22 @@ this.msg = msg; } + public boolean isStartTLS() { + return startTLS; + } + + public void setStartTLS(boolean startTLS) { + this.startTLS = startTLS; + } + + public boolean isSsl() { + return ssl; + } + + public void setSsl(boolean ssl) { + this.ssl = ssl; + } + /** * The EventEvaluator option takes a string value representing the * name of the class implementing the {@link EventEvaluators} interface. A @@ -339,4 +391,21 @@ public void setLayout(Layout<E> layout) { this.layout = layout; } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + }

1 0

[JIRA] Issue Comment Edited: (LBCLASSIC-35) Deadlock when running on multiple core processors
by Ralph Goers (JIRA) 14 Oct '08

14 Oct '08

[ http://jira.qos.ch/browse/LBCLASSIC-35?page=com.atlassian.jira.plugin.syste… ] Ralph Goers edited comment on LBCLASSIC-35 at 10/14/08 9:05 PM: ---------------------------------------------------------------- Well, that was silly. Of course I should have removed the synchronization on the logger in callAppenders. I can't believe I didn't do that since that was the whole point. Yes, requiring Appenders to have immutable names that are set before the appender is attached will make AppenderAttachableImpl much simpler since the name can then reliably be used in the ConcurrentMap. The extra code to account for the name being missing can just go away. As for the synchronization in addAppender, it is marginally better since it doesn't block aai.addAppender. The synchronization it is still doing only protects against a race condition on creating the AppenderAttachableImpl. However, this might not not even occur. My concern is for what happens when a reconfigure occurs. Is it possible that a Logger didn't have an AppenderAttachableImpl (i.e. it has no Appenders) and then does after a reconfigure? If so, then aai may need to be an AtomicReference. I haven't looked at how the Interpreter works and how loggers get updated, etc.so I'm not sure. I appreciate you looking at the code. Multiple pairs of eyeballs are always better than 1 set. was (Author: rgoers(a)apache.org) Well, that was silly. Of course I should have removed the synchronization on the logger in callAppenders. I can't believe I didn't do that since that was the whole point. Yes, requiring Appenders to have immutable names that are set before the appender is attached will make AppenderAttachableImpl much simpler since the name can then reliably be used in the ConcurrentMap. The extra code to account for the name being missing can just go away. As for the synchronization in addAppender, it is marginally better since it doesn't block aai.addAppender. The synchronization it is still doing only protects against a race condition on creating the AppenderAttachableImpl. However, this might not not even occur. My concern is for what happens when a reconfigure occurs. Is it possible that a Logger didn't have an AppenderAttachableImpl (i.e. it has not Appenders) and then does after a reconfigure? If so, then aai may need to be an AtomicReference. I haven't looked at how the Interpreter works and how loggers get updated, etc.so I'm not sure. I appreciate you looking at the code. Multiple pairs of eyeballs are always better than 1 set. > Deadlock when running on multiple core processors > ------------------------------------------------- > > Key: LBCLASSIC-35 > URL: http://jira.qos.ch/browse/LBCLASSIC-35 > Project: logback-classic > Issue Type: Bug > Components: Other > Affects Versions: unspecified > Environment: Operating System: Windows > Platform: PC > Reporter: Toni Heimala > Assignee: Ceki Gulcu > Priority: Blocker > Attachments: patch.txt > > > When you run logging into same file from many threads on a system that has more than one physical processor (Dual Core for example), a deadlock will occur after a while. This can not be reproduced on HyperThreading processors. Here's an example program that will demonstrate the behavior: > ----------------------------- > Main.java > ----------------------------- > import java.util.Date; > import java.util.concurrent.ScheduledThreadPoolExecutor; > import java.util.concurrent.TimeUnit; > import org.slf4j.Logger; > import org.slf4j.LoggerFactory; > import ch.qos.logback.classic.LoggerContext; > import ch.qos.logback.classic.joran.JoranConfigurator; > import ch.qos.logback.core.joran.spi.JoranException; > public class Main extends Thread > { > private final static String LOGGER_CONFIGURATION_FILE = "logger.xml"; > private final Logger logger = LoggerFactory.getLogger(Main.class); > > private final long start; > > public Main() > throws JoranException > { > start = new Date().getTime(); > LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); > JoranConfigurator configurator = new JoranConfigurator(); > lc.shutdownAndReset(); > configurator.setContext(lc); > configurator.doConfigure(LOGGER_CONFIGURATION_FILE); > } > > public void start() > { > ScheduledThreadPoolExecutor ex1 = new ScheduledThreadPoolExecutor(1); > ScheduledThreadPoolExecutor ex2 = new ScheduledThreadPoolExecutor(1); > ScheduledThreadPoolExecutor ex3 = new ScheduledThreadPoolExecutor(1); > ScheduledThreadPoolExecutor ex4 = new ScheduledThreadPoolExecutor(1); > ScheduledThreadPoolExecutor ex5 = new ScheduledThreadPoolExecutor(1); > ex1.scheduleAtFixedRate(new Task("EX1"), 10, 10, TimeUnit.MICROSECONDS); > ex2.scheduleAtFixedRate(new Task("EX2"), 10, 10, TimeUnit.MICROSECONDS); > ex3.scheduleAtFixedRate(new Task("EX3"), 10, 10, TimeUnit.MICROSECONDS); > ex4.scheduleAtFixedRate(new Task("EX4"), 10, 10, TimeUnit.MICROSECONDS); > ex5.scheduleAtFixedRate(new Task("EX5"), 10, 10, TimeUnit.MICROSECONDS); > > super.start(); > } > > public void run() > { > try > { > while(true) > { > logger.debug("[MAIN] {}", new Date().getTime() - start); > Thread.sleep(10); > } > } > catch (InterruptedException e) > { > logger.info("[MAIN]: Interrupted: {}", e.getMessage()); > } > } > > public static void main(String[] args) > { > try > { > Main main = new Main(); > main.start(); > } > catch (JoranException e) > { > System.out.println("Failed to load application: " + e.getMessage()); > } > } > } > ------------------------------- > Task.java > ------------------------------- > import java.util.Date; > import org.slf4j.Logger; > import org.slf4j.LoggerFactory; > public class Task implements Runnable > { > private final Logger logger = LoggerFactory.getLogger(Task.class); > private final Logger logger_main = LoggerFactory.getLogger(Main.class); > private final String name; > private final long start; > > public Task(final String name) > { > this.name = name; > start = new Date().getTime(); > } > public void run() > { > logger.debug("[{}] {}", name, new Date().getTime() - start); > logger_main.debug("[MAIN] - [{}] {}", name, new Date().getTime() - start); > } > } -- 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

1 0

[JIRA] Commented: (LBCLASSIC-35) Deadlock when running on multiple core processors
by Ralph Goers (JIRA) 14 Oct '08

14 Oct '08

[ http://jira.qos.ch/browse/LBCLASSIC-35?page=com.atlassian.jira.plugin.syste… ] Ralph Goers commented on LBCLASSIC-35: -------------------------------------- Well, that was silly. Of course I should have removed the synchronization on the logger in callAppenders. I can't believe I didn't do that since that was the whole point. Yes, requiring Appenders to have immutable names that are set before the appender is attached will make AppenderAttachableImpl much simpler since the name can then reliably be used in the ConcurrentMap. The extra code to account for the name being missing can just go away. As for the synchronization in addAppender, it is marginally better since it doesn't block aai.addAppender. The synchronization it is still doing only protects against a race condition on creating the AppenderAttachableImpl. However, this might not not even occur. My concern is for what happens when a reconfigure occurs. Is it possible that a Logger didn't have an AppenderAttachableImpl (i.e. it has not Appenders) and then does after a reconfigure? If so, then aai may need to be an AtomicReference. I haven't looked at how the Interpreter works and how loggers get updated, etc.so I'm not sure. I appreciate you looking at the code. Multiple pairs of eyeballs are always better than 1 set. > Deadlock when running on multiple core processors > ------------------------------------------------- > > Key: LBCLASSIC-35 > URL: http://jira.qos.ch/browse/LBCLASSIC-35 > Project: logback-classic > Issue Type: Bug > Components: Other > Affects Versions: unspecified > Environment: Operating System: Windows > Platform: PC > Reporter: Toni Heimala > Assignee: Ceki Gulcu > Priority: Blocker > Attachments: patch.txt > > > When you run logging into same file from many threads on a system that has more than one physical processor (Dual Core for example), a deadlock will occur after a while. This can not be reproduced on HyperThreading processors. Here's an example program that will demonstrate the behavior: > ----------------------------- > Main.java > ----------------------------- > import java.util.Date; > import java.util.concurrent.ScheduledThreadPoolExecutor; > import java.util.concurrent.TimeUnit; > import org.slf4j.Logger; > import org.slf4j.LoggerFactory; > import ch.qos.logback.classic.LoggerContext; > import ch.qos.logback.classic.joran.JoranConfigurator; > import ch.qos.logback.core.joran.spi.JoranException; > public class Main extends Thread > { > private final static String LOGGER_CONFIGURATION_FILE = "logger.xml"; > private final Logger logger = LoggerFactory.getLogger(Main.class); > > private final long start; > > public Main() > throws JoranException > { > start = new Date().getTime(); > LoggerContext lc = (LoggerContext)LoggerFactory.getILoggerFactory(); > JoranConfigurator configurator = new JoranConfigurator(); > lc.shutdownAndReset(); > configurator.setContext(lc); > configurator.doConfigure(LOGGER_CONFIGURATION_FILE); > } > > public void start() > { > ScheduledThreadPoolExecutor ex1 = new ScheduledThreadPoolExecutor(1); > ScheduledThreadPoolExecutor ex2 = new ScheduledThreadPoolExecutor(1); > ScheduledThreadPoolExecutor ex3 = new ScheduledThreadPoolExecutor(1); > ScheduledThreadPoolExecutor ex4 = new ScheduledThreadPoolExecutor(1); > ScheduledThreadPoolExecutor ex5 = new ScheduledThreadPoolExecutor(1); > ex1.scheduleAtFixedRate(new Task("EX1"), 10, 10, TimeUnit.MICROSECONDS); > ex2.scheduleAtFixedRate(new Task("EX2"), 10, 10, TimeUnit.MICROSECONDS); > ex3.scheduleAtFixedRate(new Task("EX3"), 10, 10, TimeUnit.MICROSECONDS); > ex4.scheduleAtFixedRate(new Task("EX4"), 10, 10, TimeUnit.MICROSECONDS); > ex5.scheduleAtFixedRate(new Task("EX5"), 10, 10, TimeUnit.MICROSECONDS); > > super.start(); > } > > public void run() > { > try > { > while(true) > { > logger.debug("[MAIN] {}", new Date().getTime() - start); > Thread.sleep(10); > } > } > catch (InterruptedException e) > { > logger.info("[MAIN]: Interrupted: {}", e.getMessage()); > } > } > > public static void main(String[] args) > { > try > { > Main main = new Main(); > main.start(); > } > catch (JoranException e) > { > System.out.println("Failed to load application: " + e.getMessage()); > } > } > } > ------------------------------- > Task.java > ------------------------------- > import java.util.Date; > import org.slf4j.Logger; > import org.slf4j.LoggerFactory; > public class Task implements Runnable > { > private final Logger logger = LoggerFactory.getLogger(Task.class); > private final Logger logger_main = LoggerFactory.getLogger(Main.class); > private final String name; > private final long start; > > public Task(final String name) > { > this.name = name; > start = new Date().getTime(); > } > public void run() > { > logger.debug("[{}] {}", name, new Date().getTime() - start); > logger_main.debug("[MAIN] - [{}] {}", name, new Date().getTime() - start); > } > } -- 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

1 0