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

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

17 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via e24e157ca58854e2ca14fac4c04eda212aec350f (commit) from 0ee187332ad85e5f7fa9422c8c8332d73fb2456c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=e24e157ca58854e2ca14fac4… http://github.com/ceki/logback/commit/e24e157ca58854e2ca14fac4c04eda212aec3… commit e24e157ca58854e2ca14fac4c04eda212aec350f Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Oct 17 22:13:25 2011 +0200 next release will be 1.0.0 diff --git a/logback-access/pom.xml b/logback-access/pom.xml index c5d59ad..804b17c 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.31-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>logback-access</artifactId> diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index e3cf6cc..5301435 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.31-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>logback-classic</artifactId> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index f2e7e49..7f83fda 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.31-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>logback-core</artifactId> diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index 56fa51f..a9a9b81 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.31-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index 2d8eea1..59e6c35 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.31-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 932fd24..249ec27 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -1267,7 +1267,7 @@ public class MyApp3 { <h3><a name="variableSubstitution" href="#variableSubstitution">Property substitution</a></h3> - <p>As in many scripting langues, logback configuration files support + <p>As in many scripting languages, logback configuration files support definition and substitution of properties. Properties can be defined within the configuration file itself, in an external file, in an external resource or even computed and <a @@ -1287,7 +1287,7 @@ public class MyApp3 { is the default. A property with local scope exists from the point of its definition until the end of configuration. A property with context scope is inserted into the context and lasts as long as the - context or until it is cleared. Once definied, a property in + context or until it is cleared. Once defined, a property in context scope is part of the context. As such, it is available in all logging events, including those sent to remote hosts via serialization. A property with system scope is inserted into the @@ -1298,7 +1298,7 @@ public class MyApp3 { <p>As they often come in handy, the HOSTNAME and CONTEXT_NAME properties are automatically defined and have context scope.</p> - <p class="highlight">Properrties are looked up in the the local + <p class="highlight">Properties are looked up in the the local scope first, in the context scope second, in the system properties scope third, and in the OS environment last. </p> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 56b66f8..ad93bc8 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -48,7 +48,7 @@ on properties</a>.</p> </div> - <p>Environment variables are now looke up during property + <p>Environment variables are now look up during property substitution. This feature was requested in <a href="http://jira.qos.ch/browse/LBCORE-212">LBCORE-212</a> by Alexandre Garnier. diff --git a/pom.xml b/pom.xml index 2fc2208..b50a269 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.31-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Logback-Parent</name> ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 2 +- logback-classic/pom.xml | 2 +- logback-core/pom.xml | 2 +- logback-examples/pom.xml | 2 +- logback-site/pom.xml | 2 +- .../src/site/pages/manual/configuration.html | 6 +++--- logback-site/src/site/pages/news.html | 2 +- pom.xml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-278) Give access to environment variables in configuration file
by Alexandre Garnier (JIRA) 17 Oct '11

17 Oct '11

Give access to environment variables in configuration file ---------------------------------------------------------- Key: LBCLASSIC-278 URL: http://jira.qos.ch/browse/LBCLASSIC-278 Project: logback-classic Issue Type: New Feature Reporter: Alexandre Garnier Assignee: Logback dev list It would be very nice to be able to access environment variables in configuration files. Maybe like in ant with <property environment="env"/> and then ${env.PATH} to access variable. In my use case, it's necessary to get the path to the property file to load... -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 8

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

17 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 0ee187332ad85e5f7fa9422c8c8332d73fb2456c (commit) via e643e9086b76e71db67b24c9990f47c9be3dad2f (commit) via 3356c3ef1df6890437dc765872a6605942cbb994 (commit) from e338de8293ab031e545c76757b5406d63ec21ff1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=0ee187332ad85e5f7fa9422c… http://github.com/ceki/logback/commit/0ee187332ad85e5f7fa9422c8c8332d73fb24… commit 0ee187332ad85e5f7fa9422c8c8332d73fb2456c Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Oct 17 21:44:15 2011 +0200 properties now have scope. Fixed LBCORE-212 diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerAction.java b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerAction.java index 67750ed..85d0aab 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerAction.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerAction.java @@ -40,7 +40,7 @@ public class LoggerAction extends Action { LoggerContext loggerContext = (LoggerContext) this.context; - String loggerName = attributes.getValue(NAME_ATTRIBUTE); + String loggerName = ec.subst(attributes.getValue(NAME_ATTRIBUTE)); if (OptionHelper.isEmpty(loggerName)) { inError = true; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java index 54c5f63..4884ea6 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java @@ -404,7 +404,25 @@ public class JoranConfiguratorTest { StatusPrinter.print(loggerContext); sc.containsException(ScanException.class); sc.containsMatch(Status.ERROR, "Expecting RIGHT_PARENTHESIS token but got null"); - sc.containsMatch(Status.ERROR, "See also "+ Parser.MISSING_RIGHT_PARENTHESIS); + sc.containsMatch(Status.ERROR, "See also " + Parser.MISSING_RIGHT_PARENTHESIS); } + + @Test + public void properties() throws JoranException { + String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + + "properties.xml"; + assertNull(loggerContext.getProperty(CoreConstants.HOSTNAME_KEY)); + assertNull(System.getProperty("sys")); + + configure(configFileAsStr); + assertNotNull(loggerContext.getProperty(CoreConstants.HOSTNAME_KEY)); + assertNull(loggerContext.getProperty("transientKey1")); + assertNull(loggerContext.getProperty("transientKey2")); + assertEquals("node0", loggerContext.getProperty("nodeId")); + assertEquals("tem", System.getProperty("sys")); + assertNotNull(loggerContext.getProperty("path")); + assertTrue(sc.isErrorFree(0)); + StatusPrinter.print(loggerContext); + } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java b/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java index 0afe865..fcb642f 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java +++ b/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java @@ -139,4 +139,5 @@ public class CoreConstants { public static final int MILLIS_IN_ONE_DAY = MILLIS_IN_ONE_HOUR*24; public static final int MILLIS_IN_ONE_WEEK = MILLIS_IN_ONE_DAY*7; + public static final String CONTEXT_SCOPE_VALUE = "context"; } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java index e5defa6..c863e33 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java @@ -43,6 +43,8 @@ public abstract class Action extends ContextAwareBase { public static final String FILE_ATTRIBUTE = "file"; public static final String CLASS_ATTRIBUTE = "class"; public static final String PATTERN_ATTRIBUTE = "pattern"; + public static final String SCOPE_ATTRIBUTE = "scope"; + public static final String ACTION_CLASS_ATTRIBUTE = "actionClass"; diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java index cd9e3be..9531547 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java @@ -13,6 +13,8 @@ */ package ch.qos.logback.core.joran.action; +import ch.qos.logback.core.CoreConstants; +import ch.qos.logback.core.util.ContextUtil; import org.xml.sax.Attributes; import ch.qos.logback.core.joran.spi.InterpretationContext; @@ -39,21 +41,41 @@ import java.util.Properties; */ public class PropertyAction extends Action { + enum Scope {LOCAL, CONTEXT, SYSTEM}; + static final String RESOURCE_ATTRIBUTE = "resource"; + static String INVALID_ATTRIBUTES = "In <property> element, either the \"file\" attribute alone, or " - + "the \"resource\" element alone, or both the \"name\" and \"value\" attributes must be set."; + + "the \"resource\" element alone, or both the \"name\" and \"value\" attributes must be set."; /** * Add all the properties found in the argument named 'props' to an * InterpretationContext. */ - public void setProperties(InterpretationContext ec, Properties props) { - ec.addSubstitutionProperties(props); + public void setProperties(InterpretationContext ec, Properties props, Scope scope) { + switch(scope) { + case LOCAL: ec.addSubstitutionProperties(props); + break; + case CONTEXT: + ContextUtil cu = new ContextUtil((context)); + cu.addProperties(props); + break; + case SYSTEM: + OptionHelper.setSystemProperties(this, props); + } } - public void setProperty(InterpretationContext ec, String key, String value) { - ec.addSubstitutionProperty(key, value); + public void setProperty(InterpretationContext ec, String key, String value, Scope scope) { + switch(scope) { + case LOCAL: ec.addSubstitutionProperty(key, value); + break; + case CONTEXT: + context.putProperty(key, value); + break; + case SYSTEM: + OptionHelper.setSystemProperty(this, key, value); + } } /** @@ -70,13 +92,16 @@ public class PropertyAction extends Action { String name = attributes.getValue(NAME_ATTRIBUTE); String value = attributes.getValue(VALUE_ATTRIBUTE); + String scopeStr = attributes.getValue(SCOPE_ATTRIBUTE); + + Scope scope = stringToScope(scopeStr); if (checkFileAttributeSanity(attributes)) { String file = attributes.getValue(FILE_ATTRIBUTE); file = ec.subst(file); try { FileInputStream istream = new FileInputStream(file); - loadAndSetProperties(ec, istream); + loadAndSetProperties(ec, istream, scope); } catch (IOException e) { addError("Could not read properties file [" + file + "].", e); } @@ -89,7 +114,7 @@ public class PropertyAction extends Action { } else { try { InputStream istream = resourceURL.openStream(); - loadAndSetProperties(ec, istream); + loadAndSetProperties(ec, istream, scope); } catch (IOException e) { addError("Could not read resource file [" + resource + "].", e); } @@ -99,19 +124,28 @@ public class PropertyAction extends Action { // now remove both leading and trailing spaces value = value.trim(); value = ec.subst(value); - setProperty(ec, name, value); + setProperty(ec, name, value, scope); } else { addError(INVALID_ATTRIBUTES); } } - void loadAndSetProperties(InterpretationContext ec, InputStream istream) + private Scope stringToScope(String scopeStr) { + if(Scope.SYSTEM.toString().equalsIgnoreCase(scopeStr)) + return Scope.SYSTEM; + if(Scope.CONTEXT.toString().equalsIgnoreCase(scopeStr)) + return Scope.CONTEXT; + + return Scope.LOCAL; + } + + void loadAndSetProperties(InterpretationContext ec, InputStream istream, Scope scope) throws IOException { Properties props = new Properties(); props.load(istream); istream.close(); - setProperties(ec, props); + setProperties(ec, props, scope); } boolean checkFileAttributeSanity(Attributes attributes) { diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java index ba9ca8a..6fcea69 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java @@ -57,7 +57,7 @@ public class IfAction extends Action { if (!OptionHelper.isEmpty(conditionAttribute)) { - conditionAttribute = OptionHelper.substVars(conditionAttribute, context); + conditionAttribute = OptionHelper.substVars(conditionAttribute, ic, context); PropertyEvalScriptBuilder pesb = new PropertyEvalScriptBuilder(); pesb.setContext(context); try { diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java index 7df6306..20a3cca 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java @@ -48,7 +48,7 @@ public class InterpretationContext extends ContextAwareBase implements Interpreter joranInterpreter; final List<InPlayListener> listenerList = new ArrayList<InPlayListener>(); DefaultNestedComponentRegistry defaultNestedComponentRegistry = new DefaultNestedComponentRegistry(); - + public InterpretationContext(Context context, Interpreter joranInterpreter) { this.context = context; this.joranInterpreter = joranInterpreter; @@ -120,15 +120,9 @@ public class InterpretationContext extends ContextAwareBase implements if (key == null || value == null) { return; } - // if (substitutionProperties.contains(key)) { - // LogLog.warn( - // "key [" + key - // + "] already contained in the EC properties. Overwriting."); - // } - // values with leading or trailing spaces are bad. We remove them now. value = value.trim(); - context.putProperty(key, value); + propertiesMap.put(key, value); } public void addSubstitutionProperties(Properties props) { @@ -142,17 +136,6 @@ public class InterpretationContext extends ContextAwareBase implements } } - public void addSubstitutionProperties(Map<String, String> propertyMap) { - if (propertyMap == null) { - return; - } - Iterator i = propertyMap.keySet().iterator(); - while (i.hasNext()) { - String key = (String) i.next(); - addSubstitutionProperty(key, propertyMap.get(key)); - } - } - /** * If a key is found in propertiesMap then return it. Otherwise, delegate to * the context. @@ -170,7 +153,7 @@ public class InterpretationContext extends ContextAwareBase implements if (value == null) { return null; } - return OptionHelper.substVars(value, this); + return OptionHelper.substVars(value, this, context); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/ContextUtil.java b/logback-core/src/main/java/ch/qos/logback/core/util/ContextUtil.java index 49e3c2b..8fd2065 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/util/ContextUtil.java +++ b/logback-core/src/main/java/ch/qos/logback/core/util/ContextUtil.java @@ -15,6 +15,8 @@ package ch.qos.logback.core.util; import java.net.InetAddress; import java.net.UnknownHostException; +import java.util.Iterator; +import java.util.Properties; import ch.qos.logback.core.Context; import ch.qos.logback.core.CoreConstants; @@ -44,4 +46,15 @@ public class ContextUtil extends ContextAwareBase { addError("Failed to get local hostname", e); } } + + public void addProperties(Properties props) { + if (props == null) { + return; + } + Iterator i = props.keySet().iterator(); + while (i.hasNext()) { + String key = (String) i.next(); + context.putProperty(key, props.getProperty(key)); + } + } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java b/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java index cc33aac..cdbf8c6 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java +++ b/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java @@ -17,6 +17,7 @@ import java.util.Properties; import ch.qos.logback.core.Context; import ch.qos.logback.core.CoreConstants; +import ch.qos.logback.core.spi.ContextAware; import ch.qos.logback.core.spi.PropertyContainer; /** @@ -80,54 +81,16 @@ public class OptionHelper { final static String _IS_UNDEFINED = "_IS_UNDEFINED"; /** - * Perform variable substitution in string <code>val</code> from the values - * of keys found in context property map, and if that fails, then in the - * system properties. - * - * <p> The variable substitution delimeters are <b>${</b> and <b>}</b>. - * - * <p> For example, if the context property map contains a property "key1" set - * as "value1", then the call - * - * <pre> - * String s = OptionConverter.substituteVars("Value of key is ${key1}.", context);</pre> - * - * will set the variable <code>s</code> to "Value of key is value1.". - * - * <p> If no value could be found for the specified key in the context map, - * then the system properties are searched, if that fails, then substitution - * defaults to appending "_IS_UNDEFINED" to the key name. - * - * <p> For example, if not the context not the system properties contains no - * value for the key "inexistentKey", then the call - * - * <pre> - * String s = OptionConverter.subsVars( - * "Value of inexistentKey is [${inexistentKey}]", context);</pre> - * - * will set <code>s</code> to "Value of inexistentKey is - * [inexistentKey_IS_UNDEFINED]". - * - * <p> Nevertheless, it is possible to specify a default substitution value - * using the ":-" operator. For example, the call - * - * <pre> - * String s = OptionConverter.subsVars("Value of key is [${key2:-val2}]", context);</pre> - * - * will set <code>s</code> to "Value of key is [val2]" even if the "key2" - * property is not set. - * - * <p> An {@link java.lang.IllegalArgumentException} is thrown if - * <code>val</code> contains a start delimeter "${" which is not balanced by - * a stop delimeter "}". </p> - * - * - * @param val - * The string on which variable substitution is performed. - * @throws IllegalArgumentException - * if <code>val</code> is malformed. + * @see #substVars(String, PropertyContainer, PropertyContainer) + */ + public static String substVars(String val, PropertyContainer pc1) { + return substVars(val, pc1, null); + } + + /** + * See http://logback.qos.ch/manual/configuration.html#variableSubstitution */ - public static String substVars(String val, PropertyContainer pc) { + public static String substVars(String val, PropertyContainer pc1, PropertyContainer pc2) { StringBuffer sbuf = new StringBuffer(); @@ -166,15 +129,7 @@ public class OptionHelper { String key = extracted[0]; String defaultReplacement = extracted[1]; // can be null - String replacement = null; - - // first try the props passed as parameter - replacement = pc.getProperty(key); - - // then try in System properties - if (replacement == null) { - replacement = getSystemProperty(key, null); - } + String replacement = lookup(key, pc1, pc2); // if replacement is still null, use the defaultReplacement which // can be null as well @@ -188,7 +143,7 @@ public class OptionHelper { // where the properties are // x1=p1 // x2=${x1} - String recursiveReplacement = substVars(replacement, pc); + String recursiveReplacement = substVars(replacement, pc1, pc2); sbuf.append(recursiveReplacement); } else { // if we could not find a replacement, then signal the error @@ -201,6 +156,26 @@ public class OptionHelper { } } + private static String lookup(String key, PropertyContainer pc1, + PropertyContainer pc2) { + String value = null; + // first try the props passed as parameter + value = pc1.getProperty(key); + + // then try the pc2 + if (value == null && pc2 != null) { + value = pc2.getProperty(key); + } + // then try in System properties + if (value == null) { + value = getSystemProperty(key, null); + } + if (value == null) { + value = getEnv(key); + } + return value; + } + /** * Very similar to <code>System.getProperty</code> except that the * {@link SecurityException} is absorbed. @@ -221,6 +196,20 @@ public class OptionHelper { } /** + * Lookup a key from the environment. + * @param key + * @return value corresponding to key from the OS environment + */ + public static String getEnv(String key) { + try { + return System.getenv(key); + } catch (SecurityException e) { + return null; + } + } + + + /** * Very similar to <code>System.getProperty</code> except that the * {@link SecurityException} is absorbed. * @@ -237,6 +226,22 @@ public class OptionHelper { } } + public static void setSystemProperties(ContextAware contextAware, Properties props) { + for(Object o: props.keySet()) { + String key = (String) o; + String value = props.getProperty(key); + setSystemProperty(contextAware, key, value); + } + } + + public static void setSystemProperty(ContextAware contextAware, String key, String value) { + try { + System.setProperty(key, value); + } catch (SecurityException e) { + contextAware.addError("Failed to set system property ["+key+"]", e); + } + } + /** * Very similar to {@link System#getProperties()} except that the * {@link SecurityException} is absorbed. @@ -291,4 +296,5 @@ public class OptionHelper { return ((val == null) || CoreConstants.EMPTY_STRING.equals(val)); } + } diff --git a/logback-site/src/site/pages/download.html b/logback-site/src/site/pages/download.html index 15a40a5..866ec57 100644 --- a/logback-site/src/site/pages/download.html +++ b/logback-site/src/site/pages/download.html @@ -82,7 +82,7 @@ <hr/> - <h2>Third-party tools, extensions or forks</h2> + <h2>Third-party tools, extensions or forks (in chronological order)</h2> <p>If you are the author of a logback-related project and would like us to add your project to the list below please drop a line @@ -136,6 +136,21 @@ </p> </dd> + +  + <dt> + <a + href="http://code.google.com/p/simpledb-appender/"> + Simpledb-appender</a> by Gabriel Nell + </dt> + + <dd> + <p>Logback Appender writing to Amazon SimpleDB. See also <a + href="http://www.peecho.com/blog/logging-the-cloud-with-simpledb.html">Logging + the cloud with SimpleDB</a>.</p> + </dd> + + </dl> <p/> diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index b7aa29a..932fd24 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -1264,30 +1264,59 @@ public class MyApp3 {  - <h4><a name="variableSubstitution" - href="#variableSubstitution">Variable substitution</a></h4> + <h3><a name="variableSubstitution" + href="#variableSubstitution">Property substitution</a></h3> - <p>In principle, variable substitution can occur at any point where - a value can be specified. The syntax of variable substitution is - similar to that of Unix shells. The string between an opening - <em>${</em> and closing <em>}</em> is interpreted as a key. The - value of the substituted variable can be defined in the - configuration file itself, in an external properties file or as a - system property. The corresponding value replaces <em>${aKey}</em> - sequence. For example, if the <em>java.home.dir</em> system property is - set to <em>/home/xyz</em>, then every occurrence of the sequence - <em>${java.home.dir}</em> will be interpreted as <em>/home/xyz</em>. - As they often come in handy, the ${HOSTNAME} and ${CONTEXT_NAME} - variables are automatically defined.</p> + <p>As in many scripting langues, logback configuration files support + definition and substitution of properties. Properties can be defined + within the configuration file itself, in an external file, in an + external resource or even computed and <a + href="#definingPropsOnTheFly">defined on the fly</a>. + </p> + + <p>Property substitution can occur at any point where a value can be + specified. The syntax of property substitution is similar to that of + Unix shells. The string between an opening <em>${</em> and closing + <em>}</em> is interpreted as a reference to the <em>value</em> of + the property. For property <em>aKey</em>, the string "${aKey}" will + be replaced the value held by the <em>aKey</em> property. + </p> + + <p>A property can be defined in <em>local scope</em> (the default), + in <em>context scope</em>, or in <em>system scope</em>. Local scope + is the default. A property with local scope exists from the point + of its definition until the end of configuration. A property with + context scope is inserted into the context and lasts as long as the + context or until it is cleared. Once definied, a property in + context scope is part of the context. As such, it is available in + all logging events, including those sent to remote hosts via + serialization. A property with system scope is inserted into the + JVM's system properties and lasts as long as the JVM or until it is + cleared. + </p> - <h4><a name="propsPartOfContext" - href="#propsPartOfContext">Properties are inserted into the context</a></h4> + <p>As they often come in handy, the HOSTNAME and CONTEXT_NAME + properties are automatically defined and have context scope.</p> - <p>Note that the values defined via <code><property></code> - element are actually inserted into the logger context. In other - words, they become properties of the logger context. Consequently, - they will be available in all logging events, including those sent - to remote hosts via serialization.</p> + <p class="highlight">Properrties are looked up in the the local + scope first, in the context scope second, in the system properties + scope third, and in the OS environment last. + </p> + + <p>During substitution, properties are looked up in the local scope + first, in the context scope second, in the system properties scope + third, and in the <a + href="http://download.oracle.com/javase/tutorial/essential/environment/env.html">OS + environment</a> fourth and last. + </p> + + + <h4><a name="definingProps" href="#definingProps">Defining + properties</a></h4> + + <p>Properties can be defined one at a time in the configuration file + itself or loaded wholesale from an external properties file or an + external resource.</p> <p>The next example shows a variable, a.k.a. a substitution property, declared at the beginning of the configuration file. It is @@ -1299,8 +1328,7 @@ public class MyApp3 { (logback-examples/src/main/java/chapters/configuration/variableSubstitution1.xml) </p> - <span class="asGroovy" onclick="return - asGroovy('variableSubstitution1');">View as .groovy</span> + <span class="asGroovy" onclick="return asGroovy('variableSubstitution1');">View as .groovy</span> <pre id="variableSubstitution1" class="prettyprint source"><configuration> <b><property name="USER_HOME" value="/home/sebastien" /></b> @@ -1317,7 +1345,6 @@ public class MyApp3 { </root> </configuration></pre> - <p>The next example shows the use of a System property to achieve the same result. The property is not declared in the configuration file, thus logback will look for it in the System properties. Java @@ -1354,8 +1381,8 @@ public class MyApp3 { separate file (logback-examples/src/main/java/chapters/configuration/variableSubstitution3.xml) </p> - - <pre class="prettyprint source"><configuration> + <span class="asGroovy" onclick="return asGroovy('variableSubstitution3');">View as .groovy</span> + <pre id="variableSubstitution3" class="prettyprint source"><configuration> <b><property file="src/main/java/chapters/configuration/variables1.properties" /></b> @@ -1402,6 +1429,41 @@ public class MyApp3 { </root> </configuration></pre> + + <h4>Scopes</h4> + + <p>The <span class="attr">scope</span> attribute of the + <code><property></code> element can be used to set the scope of + properties. The <span class="attr">scope</span> attribute admit the + "local", "context" and "system" strings as possible values. + </p> + + <p class="example">Example: Simple Variable substitution + (logback-examples/src/main/java/chapters/configuration/variableSubstitution4.xml) + </p> + + <span class="asGroovy" onclick="return + asGroovy('variableSubstitution4');">View as .groovy</span> + <pre id="variableSubstitution4" class="prettyprint source"><configuration> + + <property <b class="big">scope="context"</b> name="nodeId" value="node1" /> + + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <b><file>/opt/${noteId}/myApp.log</file></b> + <encoder> + <pattern>%msg%n</pattern> + </encoder> + </appender> + + <root level="debug"> + <appender-ref ref="FILE" /> + </root> +</configuration></pre> + + <p>In the above example, given that the <em>nodeId</em> property is + defined in the context scope, it will be available in every logging + event, even those sent to remote hosts via serialization.</p> + <h4>Nested variable substitution</h4> <p>Nested variable substitution is also supported. By nested, we diff --git a/logback-site/src/site/pages/manual/index.html b/logback-site/src/site/pages/manual/index.html index 66abd44..52c7c13 100644 --- a/logback-site/src/site/pages/manual/index.html +++ b/logback-site/src/site/pages/manual/index.html @@ -25,15 +25,6 @@ <h2>The logback manual</h2> - <div class="highlight"> - <p> - If you wish to print chapters in this document, we recommend - that you do so using <a - href="http://www.getfirefox.com">Firefox 2+</a>, with <em>Adapt to - page size</em> enabled, or <a - href="http://www.opera.com">Opera</a>. - </p> - </div> <p>The complete logback manual documents the latest version of logback framework. In over 150 pages and dozens of concrete diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 53060a6..56b66f8 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -28,13 +28,32 @@ <hr width="80%" align="center" /> - <h3>... .. , 2011 - Release of version 0.9.31</h3> + <h3>October 17th, 2011 - Release of version 1.0.0</h3> <p>The logback-access module now targets Tomcat 7.x and Jetty 7.x & 8.x as its servlet container platforms. This fixes <a href="http://jira.qos.ch/browse/LBACCESS-17">LBACCESS-17</a> reported by Grzegorz Grzybek.</p> + <div style="border: 1px solid #F44; background-color: #FED; padding-left: 1ex; padding-right: 1ex;"> + + <h4>Breaking change: properties are no longer automatically + inserted into the context</h4> + + <p>Properties now have a scope. Previously, the definition of a + property added it to the context. As of version 1.0, properties + are local, i.e. transient by default. For further details, please + refer to the <a + href="manual/configuration.html#variableSubstitution">documentation + on properties</a>.</p> + </div> + + <p>Environment variables are now looke up during property + substitution. This feature was requested in <a + href="http://jira.qos.ch/browse/LBCORE-212">LBCORE-212</a> by + Alexandre Garnier. + </p> + <p>Investigation of <a href="http://jira.qos.ch/browse/LBCORE-224">LBCORE-224</a> reported by Cesar Alvarez Nunez points to bug in the JVM rather http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=e643e9086b76e71db67b24c9… http://github.com/ceki/logback/commit/e643e9086b76e71db67b24c9990f47c9be3da… commit e643e9086b76e71db67b24c9990f47c9be3dad2f Merge: e338de8 3356c3e Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Oct 17 08:18:37 2011 -0700 Merge pull request #30 from imaikazuki/master Fixed a typo in H2 dialect http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=3356c3ef1df6890437dc7658… http://github.com/ceki/logback/commit/3356c3ef1df6890437dc765872a6605942cbb… commit 3356c3ef1df6890437dc765872a6605942cbb994 Author: IMAI Kazuki <imaikazuki(a)gmx.com> Date: Mon Oct 17 20:07:29 2011 +0900 Fix typo. diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/h2.sql b/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/h2.sql index 03ffb89..d1bc3a9 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/h2.sql +++ b/logback-classic/src/main/java/ch/qos/logback/classic/db/dialect/h2.sql @@ -9,7 +9,7 @@ # It is intended for H2 databases. -DROP TABLE logging_event_exception IF EXISTSu; +DROP TABLE logging_event_exception IF EXISTS; DROP TABLE logging_event_property IF EXISTS; DROP TABLE logging_event IF EXISTS; ----------------------------------------------------------------------- Summary of changes: .../java/ch/qos/logback/classic/db/dialect/h2.sql | 2 +- .../logback/classic/joran/action/LoggerAction.java | 2 +- .../classic/joran/JoranConfiguratorTest.java | 20 +++- .../java/ch/qos/logback/core/CoreConstants.java | 1 + .../ch/qos/logback/core/joran/action/Action.java | 2 + .../logback/core/joran/action/PropertyAction.java | 54 +++++++-- .../logback/core/joran/conditional/IfAction.java | 2 +- .../core/joran/spi/InterpretationContext.java | 23 +---- .../java/ch/qos/logback/core/util/ContextUtil.java | 13 ++ .../ch/qos/logback/core/util/OptionHelper.java | 120 ++++++++++--------- logback-site/src/site/pages/download.html | 17 +++- .../src/site/pages/manual/configuration.html | 114 ++++++++++++++---- logback-site/src/site/pages/manual/index.html | 9 -- logback-site/src/site/pages/news.html | 21 ++++- 14 files changed, 272 insertions(+), 128 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-296) Allow hook/override in PackagingDataCalculator
by Chris Dolan (JIRA) 15 Oct '11

15 Oct '11

Allow hook/override in PackagingDataCalculator ---------------------------------------------- Key: LBCLASSIC-296 URL: http://jira.qos.ch/browse/LBCLASSIC-296 Project: logback-classic Issue Type: New Feature Affects Versions: 0.9.29 Reporter: Chris Dolan Assignee: Logback dev list Priority: Minor I'm running Logback as my SLF4J implementation in an OSGi container (Karaf). I love the feature of ThrowableProxy that populates stacktraces with the jar/version. Under Karaf, unfortunately, that data is always wrong because Karaf processes the jars into its data/generated-bundles folder before loading. So, I forked PackagingDataCalculator in my own code to some class resolution logic (attached). That code is not important because it's too OSGi-specific for inclusion into Logback. But I'd like the ability to inject something like that calculation code into Logback so I don't have to fork PackagingDataCalculator any longer. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 5

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

14 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via e338de8293ab031e545c76757b5406d63ec21ff1 (commit) from 5c2b54f9c25b88c3afe1063fcee123b3b200d0c6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=e338de8293ab031e545c7675… http://github.com/ceki/logback/commit/e338de8293ab031e545c76757b5406d63ec21… commit e338de8293ab031e545c76757b5406d63ec21ff1 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Oct 14 16:06:11 2011 +0200 added link to ohloh widget diff --git a/logback-core/src/main/java/ch/qos/logback/core/OutputStreamAppender.java b/logback-core/src/main/java/ch/qos/logback/core/OutputStreamAppender.java index 3038fdb..ac7924b 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/OutputStreamAppender.java +++ b/logback-core/src/main/java/ch/qos/logback/core/OutputStreamAppender.java @@ -211,7 +211,7 @@ public class OutputStreamAppender<E> extends UnsynchronizedAppenderBase<E> { ((DeferredProcessingAware) event).prepareForDeferredProcessing(); } // the synchronization prevents the OutputStream from being closed while we - // are writing. It also prevents multiple thread from entering the same + // are writing. It also prevents multiple threads from entering the same // converter. Converters assume that they are in a synchronized block. synchronized (lock) { writeOut(event); diff --git a/logback-site/src/site/pages/css/screen.css b/logback-site/src/site/pages/css/screen.css index b300b22..61b4ef4 100644 --- a/logback-site/src/site/pages/css/screen.css +++ b/logback-site/src/site/pages/css/screen.css @@ -13,7 +13,6 @@ body { } .footer { - text-align: right; color: #564b47; background-color: #fff; padding:0px; diff --git a/logback-site/src/site/pages/templates/footer.js b/logback-site/src/site/pages/templates/footer.js index 0b3ef05..0b6af28 100644 --- a/logback-site/src/site/pages/templates/footer.js +++ b/logback-site/src/site/pages/templates/footer.js @@ -1,24 +1,25 @@ -document.write('<table class="footer">') +document.write('<table class="footer" border="0">') document.write('<tr>') -document.write(' <td>') -document.write('  ') -//document.write(' <a href="http://validator.w3.org/check?uri=referer">') -//document.write(' <img align="left" src="http://www.w3.org/Icons/valid-xhtml10"') -//document.write(' alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>') -document.write(' </td>') - document.write('<td valign="top">Copyright © 2011 <a href="http://www.qos.ch/">QOS.ch</a></td>') + +document.write(' <td rowspan="2">') +document.write(' <script type="text/javascript" src="http://www.ohloh.net/p/13616/widgets/project_users.js"></script>') +document.write(' </td>') + + document.write('</tr>') AAT = '@' DOOTT = '.' document.write('<tr>') -document.write('<td align="left" colspan="2">') + +document.write('<td align="left" colspan="1">') document.write('We are actively looking for volunteers to proofread the documentation. Please send your corrections or suggestions for improvement to "corrections' + AAT +'qos'+DOOTT+'ch". See also the <a href="http://articles.qos.ch/contributing.html">instructions for contributors</a>.'); document.write('</td>') +document.write(' <td> </td>') +document.write('</tr>') document.write('</table>') - diff --git a/logback-site/src/site/pages/templates/header.js b/logback-site/src/site/pages/templates/header.js index 23c86d8..4ee3250 100644 --- a/logback-site/src/site/pages/templates/header.js +++ b/logback-site/src/site/pages/templates/header.js @@ -3,9 +3,8 @@ document.write('<td><a href="http://logback.qos.ch/">'); document.write('<img src="' + prefix + 'images/logos/lblogo.jpg" alt="" border="0"/>'); document.write('</a></td>') -document.write('<td align="right"><a id="job" href="http://logback.qos.ch/job.html">'); -document.write('<img src="' + prefix + 'images/myjob.png" alt="" border="0"/>'); -document.write('</a></td>') +document.write('<td> </td>'); + document.write('</tr></table>') diff --git a/logback-site/src/site/pages/templates/left.js b/logback-site/src/site/pages/templates/left.js index dc1400b..12a2fe7 100644 --- a/logback-site/src/site/pages/templates/left.js +++ b/logback-site/src/site/pages/templates/left.js @@ -20,5 +20,3 @@ document.write('<p class="menu"><a href="http://logback.qos.ch/translator/asGroo document.write('</p>'); - - ----------------------------------------------------------------------- Summary of changes: .../ch/qos/logback/core/OutputStreamAppender.java | 2 +- logback-site/src/site/pages/css/screen.css | 1 - logback-site/src/site/pages/templates/footer.js | 21 ++++++++++--------- logback-site/src/site/pages/templates/header.js | 5 +-- logback-site/src/site/pages/templates/left.js | 2 - 5 files changed, 14 insertions(+), 17 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-224) java.lang.IllegalMonitorStateException at ch.qos.logback.core.spi.AppenderAttachableImpl.appendLoopOnAppenders(AppenderAttachableImpl.java:68)
by César Álvarez Núñez (JIRA) 13 Oct '11

13 Oct '11

java.lang.IllegalMonitorStateException at ch.qos.logback.core.spi.AppenderAttachableImpl.appendLoopOnAppenders(AppenderAttachableImpl.java:68) ---------------------------------------------------------------------------------------------------------------------------------------------- Key: LBCORE-224 URL: http://jira.qos.ch/browse/LBCORE-224 Project: logback-core Issue Type: Bug Components: Appender Affects Versions: 0.9.30 Environment: W7 64 bits, JRE 6u26 64 bits. Reporter: César Álvarez Núñez Assignee: Logback dev list I'm trying (unsuccessfully for the time being) to create a test case that will reproduce it. It happens randomly with 0.9.30 when running a regression testing with TestNG + Zookeeper + Own code. Apparently it does not happen with 0.9.29. java.lang.IllegalMonitorStateException at java.util.concurrent.locks.ReentrantReadWriteLock$Sync.tryReleaseShared(Unknown Source) at java.util.concurrent.locks.AbstractQueuedSynchronizer.releaseShared(Unknown Source) at java.util.concurrent.locks.ReentrantReadWriteLock$ReadLock.unlock(Unknown Source) at ch.qos.logback.core.spi.AppenderAttachableImpl.appendLoopOnAppenders(AppenderAttachableImpl.java:68) at ch.qos.logback.classic.Logger.appendLoopOnAppenders(Logger.java:285) at ch.qos.logback.classic.Logger.callAppenders(Logger.java:272) at ch.qos.logback.classic.Logger.buildLoggingEventAndAppend(Logger.java:473) at ch.qos.logback.classic.Logger.filterAndLog_0_Or3Plus(Logger.java:427) at ch.qos.logback.classic.Logger.info(Logger.java:631) at org.apache.zookeeper.server.ZooKeeperServer.shutdown(ZooKeeperServer.java:420) at org.apache.zookeeper.server.quorum.Leader.shutdown(Leader.java:443) at org.apache.zookeeper.server.quorum.QuorumPeer.shutdown(QuorumPeer.java:766) at org.apache.zookeeper.test.QuorumUtil.shutdown(QuorumUtil.java:224) at org.apache.zookeeper.test.QuorumUtil.shutdownAll(QuorumUtil.java:211) at org.apache.zookeeper.test.QuorumUtil.tearDown(QuorumUtil.java:255) at eswf.zk2.agents.ZkEphemeralInfoPublisherTest.tearDown(ZkEphemeralInfoPublisherTest.java:55) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) at java.lang.reflect.Method.invoke(Unknown Source) at org.testng.internal.MethodInvocationHelper.invokeMethod(MethodInvocationHelper.java:80) at org.testng.internal.Invoker.invokeConfigurationMethod(Invoker.java:543) at org.testng.internal.Invoker.invokeConfigurations(Invoker.java:212) at org.testng.internal.Invoker.invokeMethod(Invoker.java:772) at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:883) at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1208) at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:127) at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:111) at org.testng.TestRunner.privateRun(TestRunner.java:753) at org.testng.TestRunner.run(TestRunner.java:613) at org.testng.SuiteRunner.runTest(SuiteRunner.java:335) at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:330) at org.testng.SuiteRunner.privateRun(SuiteRunner.java:292) at org.testng.SuiteRunner.run(SuiteRunner.java:241) at org.testng.SuiteRunnerWorker.runSuite(SuiteRunnerWorker.java:52) at org.testng.SuiteRunnerWorker.run(SuiteRunnerWorker.java:86) at org.testng.TestNG.runSuitesSequentially(TestNG.java:1169) at org.testng.TestNG.runSuitesLocally(TestNG.java:1094) at org.testng.TestNG.run(TestNG.java:1006) at org.testng.remote.RemoteTestNG.run(RemoteTestNG.java:107) at org.testng.remote.RemoteTestNG.initAndRun(RemoteTestNG.java:199) at org.testng.remote.RemoteTestNG.main(RemoteTestNG.java:170) -- 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

6 38

[JIRA] Created: (LBCORE-227) Stuck Thread in WLS 10.3.3
by nickraja (JIRA) 12 Oct '11

12 Oct '11

Stuck Thread in WLS 10.3.3 -------------------------- Key: LBCORE-227 URL: http://jira.qos.ch/browse/LBCORE-227 Project: logback-core Issue Type: Bug Components: Appender Affects Versions: 0.9.29 Environment: HP-UX B.11.31 U ia64 Weblogic 10.3.3 java version "1.6.0.04" Reporter: nickraja Assignee: Logback dev list Priority: Critical Moved to from Log4j to Logback for stuckthread issue but logback didnt help . Here is the thread dump "[STUCK] ExecuteThread: '13' for queue: 'weblogic.kernel.Default (self-tuning)'" RUNNABLE ch.qos.logback.core.OutputStreamAppender.subAppend(OutputStreamAppender.java:216) ch.qos.logback.core.rolling.RollingFileAppender.subAppend(RollingFileAppender.java:155) ch.qos.logback.core.OutputStreamAppender.append(OutputStreamAppender.java:108) ch.qos.logback.core.UnsynchronizedAppenderBase.doAppend(UnsynchronizedAppenderBase.java:88) ch.qos.logback.core.spi.AppenderAttachableImpl.appendLoopOnAppenders(AppenderAttachableImpl.java:64) ch.qos.logback.classic.Logger.appendLoopOnAppenders(Logger.java:285) ch.qos.logback.classic.Logger.callAppenders(Logger.java:272) ch.qos.logback.classic.Logger.buildLoggingEventAndAppend(Logger.java:473) ch.qos.logback.classic.Logger.filterAndLog_0_Or3Plus(Logger.java:427) ch.qos.logback.classic.Logger.log(Logger.java:846) org.apache.commons.logging.impl.SLF4JLocationAwareLog.info(SLF4JLocationAwareLog.java:159) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

3 10

[JIRA] Created: (LBCLASSIC-282) DBAppender: Connection obtained was never closed
by Ralph Schaer (JIRA) 12 Oct '11

12 Oct '11

DBAppender: Connection obtained was never closed ------------------------------------------------ Key: LBCLASSIC-282 URL: http://jira.qos.ch/browse/LBCLASSIC-282 Project: logback-classic Issue Type: Bug Components: appender Affects Versions: 0.9.29 Environment: Windows 7, Java 6, Spring 3.1 Snapshot, slf4j 1.6.1, logback 0.9.29, bonecp 0.7.1 Reporter: Ralph Schaer Assignee: Logback dev list Priority: Minor I use BoneCP together with logback. BoneCP complains about a connection that is never closed in the DBAppender The problem is in the method discoverConnnectionProperties in ConnectionSourceBase. This method does not close the database connection 19:48:56.896 [BoneCP-connection-watch-thread] ERROR com.jolbox.bonecp.CloseThreadMonitor - Connection obtained from thread [Thread-4] was never closed. Stack trace of location where connection was obtained follows: java.lang.Thread.getStackTrace(Thread.java:1479) com.jolbox.bonecp.BoneCP.captureStackTrace(BoneCP.java:543) com.jolbox.bonecp.BoneCP.watchConnection(BoneCP.java:532) com.jolbox.bonecp.BoneCP.getConnection(BoneCP.java:518) com.jolbox.bonecp.BoneCPDataSource.getConnection(BoneCPDataSource.java:114) ch.qos.logback.core.db.DataSourceConnectionSource.getConnection(DataSourceConnectionSource.java:72) ch.qos.logback.core.db.ConnectionSourceBase.discoverConnnectionProperties(ConnectionSourceBase.java:47) ch.qos.logback.core.db.DataSourceConnectionSource.start(DataSourceConnectionSource.java:52) -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 2

[JIRA] Created: (LBCORE-225) Do not require authentication to use TLS in SMTPAppender
by Mark Woon (JIRA) 11 Oct '11

11 Oct '11

Do not require authentication to use TLS in SMTPAppender -------------------------------------------------------- Key: LBCORE-225 URL: http://jira.qos.ch/browse/LBCORE-225 Project: logback-core Issue Type: Bug Affects Versions: 0.9.30 Reporter: Mark Woon Assignee: Logback dev list Enabling TLS should not require authentication. Pull request submitted to remove this requirement. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 3

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

11 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 5c2b54f9c25b88c3afe1063fcee123b3b200d0c6 (commit) via dd63419d3e2a16c3d706a6a3d8cd37a90ecbcc9f (commit) via da07dc15ebb09c1a882be2596ec1b0cecb1377ab (commit) from b572ad6f784af47731dffcbe3e56476b190ede44 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=5c2b54f9c25b88c3afe1063f… http://github.com/ceki/logback/commit/5c2b54f9c25b88c3afe1063fcee123b3b200d… commit 5c2b54f9c25b88c3afe1063fcee123b3b200d0c6 Merge: dd63419 b572ad6 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Oct 11 22:53:02 2011 +0200 fixing LBCORE-225 http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=dd63419d3e2a16c3d706a6a3… http://github.com/ceki/logback/commit/dd63419d3e2a16c3d706a6a3d8cd37a90ecbc… commit dd63419d3e2a16c3d706a6a3d8cd37a90ecbcc9f Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Oct 11 22:51:25 2011 +0200 fixing LBCORE-225 diff --git a/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java b/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java index 97a7258..e6790a2 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/net/SMTPAppenderBase.java @@ -80,6 +80,7 @@ public abstract class SMTPAppenderBase<E> extends AppenderBase<E> { String username; String password; + String localhost; private String charsetEncoding = "UTF-8"; @@ -117,6 +118,10 @@ public abstract class SMTPAppenderBase<E> extends AppenderBase<E> { } props.put("mail.smtp.port", Integer.toString(smtpPort)); + if(localhost != null) { + props.put("mail.smtp.localhost", localhost); + } + LoginAuthenticator loginAuthenticator = null; if (username != null) { @@ -128,7 +133,7 @@ public abstract class SMTPAppenderBase<E> extends AppenderBase<E> { addError("Both SSL and StartTLS cannot be enabled simultaneously"); } else { if (isSTARTTLS()) { - //props.setProperty("mail.smtp.auth", "true"); + // see also http://jira.qos.ch/browse/LBCORE-225 props.put("mail.smtp.starttls.enable", "true"); } if (isSSL()) { @@ -445,6 +450,24 @@ public abstract class SMTPAppenderBase<E> extends AppenderBase<E> { return smtpPort; } + public String getLocalhost() { + return localhost; + } + + /** + * Set the "mail.smtp.localhost" property to the value passed as parameter to + * this method. + * + * <p>Useful in case the hostname for the client host is not fully qualified + * and as a consequence the SMTP server rejects the clients HELO/EHLO command. + * </p> + * + * @param localhost + */ + public void setLocalhost(String localhost) { + this.localhost = localhost; + } + public CyclicBufferTracker<E> getCyclicBufferTracker() { return cbTracker; } diff --git a/logback-site/src/site/pages/manual/appenders.html b/logback-site/src/site/pages/manual/appenders.html index 72838df..4334f4e 100644 --- a/logback-site/src/site/pages/manual/appenders.html +++ b/logback-site/src/site/pages/manual/appenders.html @@ -1775,10 +1775,9 @@ public interface TriggeringPolicy<E> extends LifeCycle { <p>By default, this option is set to "%logger{20} - %m".</p> </td> + </tr> <tr class="alt"> - - <td><b><span class="option">discriminator</span></b></td> <td><code><a href="../xref/ch/qos/logback/core/sift/Discriminator.html">Discriminator</a></code></td> <td> @@ -1903,6 +1902,21 @@ public interface TriggeringPolicy<E> extends LifeCycle { </tr> + <tr class="alt"> + <td><b>localhost</b></td> + <td><code>String</code></td> + <td>In case the hostname of the SMTP client is not properly + configured, e.g. if the client hostname is not fully + qualified, certain SMTP servers may reject the HELO/EHLO + commands sent by the client. To overcome this issue, you may + set the value of the <span class="option">localhost</span> + property to the fully qualified name of the client host. See + also the "mail.smtp.localhost" property in the documentation + for the <a + href="http://javamail.kenai.com/nonav/javadocs/com/sun/mail/smtp/package-summary.…">com.sun.mail.smtp</a> + package.</td> + </tr> + </table> <p>The <code>SMTPAppender</code> keeps only the last 256 logging diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 5018b38..f7f8b6a 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -42,12 +42,19 @@ <code>CopyOnWriteArrayList</code> instead of the apparently buggy <code>ReadWriteLock</code>.</p> + <p>In STARTTLS mode, "mail.smtp.auth" property is no longer set + automatically. This fixes <a + href="http://jira.qos.ch/browse/LBCORE-225">LBCORE-225</a> + reported by Mark Woon.</p> + <p>Fixed infinitely recursive calls in <code>AccessConverter#addError</code> methods as reported in <a href="http://jira.qos.ch/browse/LBACCESS-25">LBACCESS-25</a> by Pierre Queinnec. </p> + + <h3>September 21st, 2011 - Release of version 0.9.30</h3> <p>Archive removal can now deal with prolonged periods of http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=da07dc15ebb09c1a882be259… http://github.com/ceki/logback/commit/da07dc15ebb09c1a882be2596ec1b0cecb137… commit da07dc15ebb09c1a882be2596ec1b0cecb1377ab Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Oct 7 10:19:33 2011 +0200 minor edits diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java b/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java index 2794a22..41709a5 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java @@ -37,14 +37,24 @@ public class StatusPrinter { public static void setPrintStream(PrintStream printStream) { ps = printStream; } - + /** * Print the contents of the context statuses, but only if they contain * warnings or errors. - * + * * @param context */ public static void printInCaseOfErrorsOrWarnings(Context context) { + printInCaseOfErrorsOrWarnings(context, 0); + } + + /** + * Print the contents of the context status, but only if they contain + * warnings or errors occurring later then the threshold. + * + * @param context + */ + public static void printInCaseOfErrorsOrWarnings(Context context, long threshold) { if (context == null) { throw new IllegalArgumentException("Context argument cannot be null"); } @@ -55,8 +65,8 @@ public class StatusPrinter { + "\" has no status manager"); } else { StatusChecker sc = new StatusChecker(context); - if (sc.getHighestLevel(0) >= ErrorStatus.WARN) { - print(sm); + if (sc.getHighestLevel(threshold) >= ErrorStatus.WARN) { + print(sm, threshold); } } } @@ -64,7 +74,7 @@ public class StatusPrinter { /** * Print the contents of the context statuses, but only if they contain * errors. - * + * * @param context */ public static void printIfErrorsOccured(Context context) { @@ -86,7 +96,7 @@ public class StatusPrinter { /** * Print the contents of the context's status data. - * + * * @param context */ public static void print(Context context) { @@ -128,7 +138,7 @@ public class StatusPrinter { buildStrFromStatusList(sb, statusList); ps.println(sb.toString()); } - + private static void buildStrFromStatusList(StringBuilder sb, List<Status> statusList) { if(statusList == null) @@ -141,7 +151,7 @@ public class StatusPrinter { // private static void buildStrFromStatusManager(StringBuilder sb, StatusManager sm) { // } - + private static void appendThrowable(StringBuilder sb, Throwable t) { String[] stringRep = ThrowableToStringArray.convert(t); diff --git a/logback-examples/src/main/java/chapters/configuration/MyApp3.java b/logback-examples/src/main/java/chapters/configuration/MyApp3.java index 3db4562..dc3d14e 100644 --- a/logback-examples/src/main/java/chapters/configuration/MyApp3.java +++ b/logback-examples/src/main/java/chapters/configuration/MyApp3.java @@ -30,19 +30,19 @@ public class MyApp3 { public static void main(String[] args) { // assume SLF4J is bound to logback in the current environment - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); try { JoranConfigurator configurator = new JoranConfigurator(); - configurator.setContext(lc); - // the context was probably already configured by default configuration - // rules - lc.reset(); + configurator.setContext(context); + // Call context.reset() to clear any previous configuration, e.g. default + // configuration. For multi-step configuration, omit calling context.reset(). + context.reset(); configurator.doConfigure(args[0]); } catch (JoranException je) { // StatusPrinter will handle this } - StatusPrinter.printInCaseOfErrorsOrWarnings(lc); + StatusPrinter.printInCaseOfErrorsOrWarnings(context); logger.info("Entering application."); diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 9df3117..b7aa29a 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -480,12 +480,12 @@ public class Foo { <h3><a name="joranDirectly" href="#joranDirectly">Invoking <code>JoranConfigurator</code> directly</a></h3> - <p>Logback relies on a configuration library called Joran which is - part of logback-core. Logback's default configuration mechanism - invokes <code>JoranConfigurator</code> on the default configuration - file it finds on the class path. If you wish to - override logback's default configuration mechanism for whatever reason, you can do so - by invoking <code>JoranConfigurator</code> directly. The next + <p>Logback relies on a configuration library called Joran, part of + logback-core. Logback's default configuration mechanism invokes + <code>JoranConfigurator</code> on the default configuration file it + finds on the class path. If you wish to override logback's default + configuration mechanism for whatever reason, you can do so by + invoking <code>JoranConfigurator</code> directly. The next application, <em>MyApp3</em>, invokes JoranConfigurator on a configuration file passed as a parameter.</p> @@ -508,19 +508,19 @@ public class MyApp3 { public static void main(String[] args) { // assume SLF4J is bound to logback in the current environment - <b>LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();</b> + <b>LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();</b> <b>try { JoranConfigurator configurator = new JoranConfigurator(); - configurator.setContext(lc); - // the context was probably already configured by default configuration - // rules - lc.reset(); + configurator.setContext(context); + // Call context.reset() to clear any previous configuration, e.g. default + // configuration. For multi-step configuration, omit calling context.reset(). + context.reset(); configurator.doConfigure(args[0]); } catch (JoranException je) { // StatusPrinter will handle this } - StatusPrinter.printInCaseOfErrorsOrWarnings(lc);</b> + StatusPrinter.printInCaseOfErrorsOrWarnings(context);</b> logger.info("Entering application."); @@ -536,8 +536,8 @@ public class MyApp3 { context, and then finally asks the configurator to configure the context using the configuration file passed as a parameter to the application. Internal status data is printed in case of warnings or - errors. - </p> + errors. Note that for multi-step configuration, + <code>context.reset()</code> invocation should be omitted.</p> <h3><a name="viewingStatusMessages" href="#viewingStatusMessages">Viewing status messages</a> ----------------------------------------------------------------------- Summary of changes: .../ch/qos/logback/core/net/SMTPAppenderBase.java | 25 +++++++++++++++++- .../ch/qos/logback/core/util/StatusPrinter.java | 26 ++++++++++++----- .../main/java/chapters/configuration/MyApp3.java | 12 ++++---- logback-site/src/site/pages/manual/appenders.html | 18 +++++++++++- .../src/site/pages/manual/configuration.html | 28 ++++++++++---------- logback-site/src/site/pages/news.html | 5 +++ 6 files changed, 83 insertions(+), 31 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0