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

svn commit: r784 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html
by noreply.seb＠qos.ch 26 Oct '06

26 Oct '06

Author: seb Date: Thu Oct 26 14:29:57 2006 New Revision: 784 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java Log: minor fix Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java Thu Oct 26 14:29:57 2006 @@ -26,55 +26,56 @@ public void addCss(StringBuffer sbuf) { sbuf.append("<STYLE type=\"text/css\">"); - sbuf.append(" table { "); - sbuf.append(" margin-left: 2em; "); - sbuf.append(" margin-right: 2em; "); - sbuf.append(" border-left: 2px solid #AAA; "); + sbuf.append("table{ "); + sbuf.append("margin-left: 2em; "); + sbuf.append("margin-right: 2em; "); + sbuf.append("border-left: 2px solid #AAA; "); sbuf.append("}"); sbuf.append(LINE_SEP); sbuf.append("TR.even { "); - sbuf.append(" background: #FFFFFF; "); + sbuf.append("background: #FFFFFF; "); sbuf.append("}"); sbuf.append(LINE_SEP); sbuf.append("TR.odd { "); - sbuf.append(" background: #EAEAEA; "); + sbuf.append("background: #EAEAEA; "); sbuf.append("}"); sbuf.append(LINE_SEP); - sbuf.append("TD { "); - sbuf.append(" padding-right: 1ex; "); - sbuf.append(" padding-left: 1ex; "); - sbuf.append(" border-right: 2px solid #AAA;"); + sbuf.append("TD {"); + sbuf.append("padding-right: 1ex; "); + sbuf.append("padding-left: 1ex; "); + sbuf.append("border-right: 2px solid #AAA;"); sbuf.append("}"); sbuf.append(LINE_SEP); sbuf.append("TD.Time, TD.Date { "); - sbuf.append(" text-align: right; "); - sbuf.append(" font-family: courier, monospace; "); - sbuf.append(" font-size: smaller; "); + sbuf.append("text-align: right; "); + sbuf.append("font-family: courier, monospace; "); + sbuf.append("font-size: smaller; "); sbuf.append("}"); sbuf.append(LINE_SEP); sbuf .append("TD.RemoteHost, TD.RequestProtocol, TD.RequestHeader, TD.RequestURL, TD.RemoteUser, TD.RequestURI, TD.ServerName {"); - sbuf.append(" text-align: left; "); + sbuf.append("text-align: left; "); sbuf.append("}"); sbuf.append(LINE_SEP); sbuf .append("TD.RequestAttribute, TD.RequestCookie, TD.ResponseHeader, TD.RequestParameter {"); - sbuf.append(" text-align: left; "); + sbuf.append("text-align: left; "); sbuf.append("}"); sbuf.append(LINE_SEP); sbuf .append("TD.RemoteIPAddress, TD.LocalIPAddress, TD.ContentLength, TD.StatusCode, TD.LocalPort {"); - sbuf.append(" text-align: right; "); + sbuf.append("text-align: right; "); sbuf.append("}"); sbuf.append(LINE_SEP); sbuf.append("TR.header { "); - sbuf.append(" background: #596ED5; "); - sbuf.append(" color: #FFF; "); - sbuf.append(" font-weight: bold; "); - sbuf.append(" font-size: larger; "); + sbuf.append("background: #596ED5; "); + sbuf.append("color: #FFF; "); + sbuf.append("font-weight: bold; "); + sbuf.append("font-size: larger; "); sbuf.append("}"); sbuf.append(LINE_SEP); sbuf.append(" }"); sbuf.append("}"); + sbuf.append("</STYLE>"); } } \ No newline at end of file Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java Thu Oct 26 14:29:57 2006 @@ -38,15 +38,13 @@ public class HTMLLayout extends HTMLLayoutBase implements AccessLayout { /** - * Default pattern string for log output. Currently set to the string <b>"%m" - * </b> which just prints the application supplied message. + * Default pattern string for log output. */ - static final String DEFAULT_CONVERSION_PATTERN = "%remoteIP%date%requestURL%statusCode%bytesSent"; + static final String DEFAULT_CONVERSION_PATTERN = "%h%l%u%t%r%s%b"; /** * Constructs a PatternLayout using the DEFAULT_LAYOUT_PATTERN. * - * The default pattern just produces the application supplied message. */ public HTMLLayout() { pattern = DEFAULT_CONVERSION_PATTERN;

1 0

svn commit: r783 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/tomcat logback-core/src/main/java/ch/qos/logback/core logback-core/src/main/java/ch/qos/logback/core/joran/action logback-core/src/main/java/ch/qos/logback/core/pattern
by noreply.seb＠qos.ch 26 Oct '06

26 Oct '06

Author: seb Date: Thu Oct 26 14:28:08 2006 New Revision: 783 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java 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/pattern/PatternLayoutBase.java Log: Suppressed converterMap from context, using the object list instead. Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java Thu Oct 26 14:28:08 2006 @@ -87,7 +87,6 @@ // serialized. For the time being, we ignore this shortcoming. Map<String, String> propertyMap = new HashMap<String, String>(); Map<String, Object> objectMap = new HashMap<String, Object>(); - Map<String, String> converterMap = new HashMap<String, String>(); private FilterAttachableImpl fai = new FilterAttachableImpl(); AppenderAttachableImpl aai = new AppenderAttachableImpl(); @@ -199,10 +198,6 @@ objectMap.put(key, value); } - public Map<String, String> getConverterMap() { - return converterMap; - } - public void addFilter(Filter newFilter) { fai.addFilter(newFilter); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java Thu Oct 26 14:28:08 2006 @@ -54,13 +54,6 @@ */ public void setProperty(String key, String value); - - /** - * LB contexts have a notion of context-specific converter maps. - * @return - */ - public Map<String, String> getConverterMap(); - /** * Contexts are named objects. * Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java Thu Oct 26 14:28:08 2006 @@ -25,7 +25,6 @@ // serialized. For the time being, we ignore this shortcoming. Map<String, String> propertyMap = new HashMap<String, String>(); Map<String, Object> objectMap = new HashMap<String, Object>(); - Map<String, String> converterMap = new HashMap<String, String>(); private FilterAttachableImpl fai = new FilterAttachableImpl(); public StatusManager getStatusManager() { @@ -52,10 +51,6 @@ objectMap.put(key, value); } - public Map<String, String> getConverterMap() { - return converterMap; - } - public void addFilter(Filter newFilter) { fai.addFilter(newFilter); } 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 Thu Oct 26 14:28:08 2006 @@ -67,7 +67,7 @@ } // put the new rule into the rule registry ruleRegistry.put(conversionWord, converterClass); - + } catch (Exception oops) { inError = true; errorMsg = "Could not add conversion rule to PatternLayout."; Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java Thu Oct 26 14:28:08 2006 @@ -13,6 +13,7 @@ import java.util.Map; import ch.qos.logback.core.Context; +import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.LayoutBase; import ch.qos.logback.core.pattern.parser.Node; import ch.qos.logback.core.pattern.parser.Parser; @@ -55,7 +56,7 @@ // contextMap is more specific than the default map Context context = getContext(); if (context != null) { - Map<String, String> contextMap = context.getConverterMap(); + Map<String, String> contextMap = (Map) context.getObject(CoreGlobal.PATTERN_RULE_REGISTRY); if (contextMap != null) { effectiveMap.putAll(contextMap); }

1 0

svn commit: r782 - logback/trunk/logback-classic
by noreply.ceki＠qos.ch 25 Oct '06

25 Oct '06

Author: ceki Date: Thu Oct 26 00:15:35 2006 New Revision: 782 Modified: logback/trunk/logback-classic/mdcfilter.xml Log: ongoing work Modified: logback/trunk/logback-classic/mdcfilter.xml ============================================================================== --- logback/trunk/logback-classic/mdcfilter.xml (original) +++ logback/trunk/logback-classic/mdcfilter.xml Thu Oct 26 00:15:35 2006 @@ -8,7 +8,7 @@ </layout> <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> <Name>myFilter</Name> - <x>DENY</x> + <OnMatch>DENY</OnMatch> <Evaluator class="ch.qos.logback.classic.boolex.JaninoEventEvaluator"> <Name>mdcEvaluator</Name> <Expression>mdc!=null && "val".equals(mdc.get("key"))</Expression> @@ -17,9 +17,6 @@ </filter> </appender> - <root> <level value="debug" />

1 0

svn commit: r781 - in logback/trunk/logback-classic: . examples/src/chapter5
by noreply.ceki＠qos.ch 25 Oct '06

25 Oct '06

Author: ceki Date: Wed Oct 25 23:39:51 2006 New Revision: 781 Modified: logback/trunk/logback-classic/examples/src/chapter5/GoMDC.java logback/trunk/logback-classic/mdcfilter.xml Log: seems to work ok Modified: logback/trunk/logback-classic/examples/src/chapter5/GoMDC.java ============================================================================== --- logback/trunk/logback-classic/examples/src/chapter5/GoMDC.java (original) +++ logback/trunk/logback-classic/examples/src/chapter5/GoMDC.java Wed Oct 25 23:39:51 2006 @@ -26,7 +26,7 @@ } logger.debug("I know me " + 0); - MDC.put("k", "v"); + MDC.put("key", "val"); logger.debug("I know me " + 1); StatusPrinter.print(lc); Modified: logback/trunk/logback-classic/mdcfilter.xml ============================================================================== --- logback/trunk/logback-classic/mdcfilter.xml (original) +++ logback/trunk/logback-classic/mdcfilter.xml Wed Oct 25 23:39:51 2006 @@ -11,13 +11,14 @@ <x>DENY</x> <Evaluator class="ch.qos.logback.classic.boolex.JaninoEventEvaluator"> <Name>mdcEvaluator</Name> - <Expression>mdc!=null && mdc.get("key").equals("val")</Expression> + <Expression>mdc!=null && "val".equals(mdc.get("key"))</Expression> </Evaluator> </filter> </appender>  <root>

1 0

svn commit: r780 - in logback/trunk/logback-classic: . examples/src/chapter5 src/main/java/ch/qos/logback/classic/boolex
by noreply.ceki＠qos.ch 25 Oct '06

25 Oct '06

Author: ceki Date: Wed Oct 25 23:35:03 2006 New Revision: 780 Added: logback/trunk/logback-classic/examples/src/chapter5/GoMDC.java logback/trunk/logback-classic/mdcfilter.xml Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java Log: Added MDC support to JaninoEventEvaluator, with moderate success Added: logback/trunk/logback-classic/examples/src/chapter5/GoMDC.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/examples/src/chapter5/GoMDC.java Wed Oct 25 23:35:03 2006 @@ -0,0 +1,34 @@ +package chapter5; + +import org.slf4j.LoggerFactory; + +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.MDC; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.util.StatusPrinter; + +public class GoMDC { + + public static void main(String[] args) { + Logger logger = (Logger) LoggerFactory + .getLogger(GoMDC.class); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + + try { + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(lc); + configurator.doConfigure("mdcFilter.xml"); + + } catch (JoranException je) { + StatusPrinter.print(lc); + } + + logger.debug("I know me " + 0); + MDC.put("k", "v"); + logger.debug("I know me " + 1); + + StatusPrinter.print(lc); + } +} \ No newline at end of file Added: logback/trunk/logback-classic/mdcfilter.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/mdcfilter.xml Wed Oct 25 23:35:03 2006 @@ -0,0 +1,28 @@ +<configuration> + + <appender name="STDOUT" + class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <param name="Pattern" + value="%-4relative [%thread] %-5level %X{testKey} - %msg%n" /> + </layout> + <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> + <Name>myFilter</Name> + <x>DENY</x> + <Evaluator class="ch.qos.logback.classic.boolex.JaninoEventEvaluator"> + <Name>mdcEvaluator</Name> + <Expression>mdc!=null && mdc.get("key").equals("val")</Expression> + </Evaluator> + + </filter> + </appender> + + + + <root> + <level value="debug" /> + <appender-ref ref="STDOUT" /> + </root> +</configuration> + Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java Wed Oct 25 23:35:03 2006 @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Map; import org.slf4j.Marker; @@ -34,6 +35,7 @@ DEFAULT_PARAM_NAME_LIST.add("level"); DEFAULT_PARAM_NAME_LIST.add("timeStamp"); DEFAULT_PARAM_NAME_LIST.add("marker"); + DEFAULT_PARAM_NAME_LIST.add("mdc"); DEFAULT_PARAM_NAME_LIST.add("throwable"); @@ -48,9 +50,14 @@ DEFAULT_PARAM_TYPE_LIST.add(int.class); DEFAULT_PARAM_TYPE_LIST.add(long.class); DEFAULT_PARAM_TYPE_LIST.add(Marker.class); + DEFAULT_PARAM_TYPE_LIST.add(Map.class); DEFAULT_PARAM_TYPE_LIST.add(Throwable.class); } + + public JaninoEventEvaluator() { + + } protected String getDecoratedExpression() { return IMPORT_LEVEL + getExpression(); } @@ -94,6 +101,7 @@ values[i++] = loggingEvent.getLevel().toInteger(); values[i++] = new Long(loggingEvent.getTimeStamp()); values[i++] = loggingEvent.getMarker(); + values[i++] = loggingEvent.getMDCPropertyMap(); if (loggingEvent.getThrowableInformation() != null) { values[i++] = loggingEvent.getThrowableInformation().getThrowable(); } else {

1 0

svn commit: r779 - in logback/trunk/logback-core/src/main/java/ch/qos/logback/core: filter joran/action util
by noreply.ceki＠qos.ch 25 Oct '06

25 Oct '06

Author: ceki Date: Wed Oct 25 23:33:56 2006 New Revision: 779 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedSimplePropertyIA.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/PropertySetter.java Log: - trying to make an MDC based filtering work Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/AbstractEvalutatorFilter.java Wed Oct 25 23:33:56 2006 @@ -24,6 +24,7 @@ int onMatch = NEUTRAL; int onMismatch = NEUTRAL; + public void setOnMatch(String action) { if ("NEUTRAL".equals(action)) { onMatch = NEUTRAL; Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/EvaluatorFilter.java Wed Oct 25 23:33:56 2006 @@ -7,8 +7,20 @@ EventEvaluator evaluator; + public EvaluatorFilter() { + } - + + public void setX(String action) { + if ("NEUTRAL".equals(action)) { + onMatch = NEUTRAL; + } else if ("ACCEPT".equals(action)) { + onMatch = ACCEPT; + } else if ("DENY".equals(action)) { + onMatch = DENY; + } + } + public void start() { if(evaluator != null) { super.start(); @@ -21,12 +33,17 @@ return evaluator; } + public void setEvaluator(EventEvaluator evaluator) { this.evaluator = evaluator; } public int decide(Object event) { - + // let us not throw an exception + // see also bug #17. + if(!isStarted()) { + return NEUTRAL; + } try { if (evaluator.evaluate(event)) { return onMatch; Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComponentIA.java Wed Oct 25 23:33:56 2006 @@ -45,7 +45,7 @@ public boolean isApplicable( Pattern pattern, Attributes attributes, InterpretationContext ec) { - //LogLog.debug("in NestComponentIA.isApplicable <" + pattern + ">"); + //System.out.println("in NestComponentIA.isApplicable <" + pattern + ">"); String nestedElementTagName = pattern.peekLast(); // calling ec.peekObject with an empty stack will throw an exception @@ -55,7 +55,8 @@ Object o = ec.peekObject(); PropertySetter parentBean = new PropertySetter(o); - + parentBean.setContext(context); + int containmentType = parentBean.canContainComponent(nestedElementTagName); switch (containmentType) { @@ -66,6 +67,7 @@ // we only push action data if NestComponentIA is applicable case PropertySetter.AS_COLLECTION: case PropertySetter.AS_COMPONENT: + addInfo("is dmmed applicable for "+pattern); ImplicitActionData ad = new ImplicitActionData(parentBean, containmentType); actionDataStack.push(ad); @@ -108,7 +110,7 @@ ((ContextAware) actionData.nestedComponent).setContext(this.context); } //getLogger().debug( - // "Pushing component <{}> on top of the object stack.", localName); + addInfo("Pushing component <"+localName+"> on top of the object stack."); ec.pushObject(actionData.nestedComponent); } catch (Exception oops) { actionData.inError = true; @@ -151,9 +153,8 @@ // Now let us attach the component switch (actionData.containmentType) { case PropertySetter.AS_COMPONENT: - //getLogger().debug( - //"Setting [{}] to parent of type [{}]", tagName, - //actionData.parentBean.getObjClass()); + //addInfo("Setting ["+tagName+"}] to parent of type ["+actionData.parentBean.getObjClass()+"]"); + actionData.parentBean.setComponent( tagName, actionData.nestedComponent); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedSimplePropertyIA.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedSimplePropertyIA.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedSimplePropertyIA.java Wed Oct 25 23:33:56 2006 @@ -42,7 +42,7 @@ public boolean isApplicable( Pattern pattern, Attributes attributes, InterpretationContext ec) { - //LogLog.debug("in NestComponentIA.isApplicable <" + pattern + ">"); + //System.out.println("in NestedSimplePropertyIA.isApplicable <" + pattern + ">"); String nestedElementTagName = pattern.peekLast(); // no point in attempting if there is no parent object @@ -52,7 +52,8 @@ Object o = ec.peekObject(); PropertySetter parentBean = new PropertySetter(o); - + parentBean.setContext(context); + int containmentType = parentBean.canContainComponent(nestedElementTagName); switch (containmentType) { @@ -65,7 +66,7 @@ ImplicitActionData ad = new ImplicitActionData(parentBean, containmentType); ad.propertyName = nestedElementTagName; actionDataStack.push(ad); - // System.out.println("NestedSimplePropertyIA deemed applicable for " +pattern); + //System.out.println("in NestedSimplePropertyIA deemed applicable <" + pattern + ">"); return true; default: addError("PropertySetter.canContainComponent returned " + containmentType); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/PropertySetter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/PropertySetter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/PropertySetter.java Wed Oct 25 23:33:56 2006 @@ -92,34 +92,33 @@ * Set the properties for the object that match the <code>prefix</code> * passed as parameter. */ -// public void setProperties(Properties properties, String prefix) { -// int len = prefix.length(); -// -// for (Enumeration e = properties.propertyNames(); e.hasMoreElements();) { -// String key = (String) e.nextElement(); -// -// // handle only properties that start with the desired frefix. -// if (key.startsWith(prefix)) { -// // ignore key if it contains dots after the prefix -// if (key.indexOf('.', len + 1) > 0) { -// // System.err.println("----------Ignoring---["+key -// // +"], prefix=["+prefix+"]."); -// continue; -// } -// -// String value = OptionHelper.findAndSubst(key, properties); -// -// key = key.substring(len); -// -// if ("layout".equals(key) && obj instanceof Appender) { -// continue; -// } -// -// setProperty(key, value); -// } -// } -// } - + // public void setProperties(Properties properties, String prefix) { + // int len = prefix.length(); + // + // for (Enumeration e = properties.propertyNames(); e.hasMoreElements();) { + // String key = (String) e.nextElement(); + // + // // handle only properties that start with the desired frefix. + // if (key.startsWith(prefix)) { + // // ignore key if it contains dots after the prefix + // if (key.indexOf('.', len + 1) > 0) { + // // System.err.println("----------Ignoring---["+key + // // +"], prefix=["+prefix+"]."); + // continue; + // } + // + // String value = OptionHelper.findAndSubst(key, properties); + // + // key = key.substring(len); + // + // if ("layout".equals(key) && obj instanceof Appender) { + // continue; + // } + // + // setProperty(key, value); + // } + // } + // } /** * Set a property on this PropertySetter's Object. If successful, this method * will invoke a setter method on the underlying Object. The setter is the one @@ -227,7 +226,6 @@ if (propertyDescriptor != null) { Method setterMethod = propertyDescriptor.getWriteMethod(); - if (setterMethod != null) { // getLogger().debug( // "Found setter method for property [{}] in class {}", name, @@ -295,7 +293,8 @@ } public void setComponent(String name, Object childComponent) { - PropertyDescriptor propertyDescriptor = getPropertyDescriptor(name); + String dName = Introspector.decapitalize(name); + PropertyDescriptor propertyDescriptor = getPropertyDescriptor(dName); if (propertyDescriptor == null) { addWarn("Could not find PropertyDescriptor for [" + name + "] in " @@ -388,7 +387,10 @@ } for (int i = 0; i < propertyDescriptors.length; i++) { + //System.out.println("Comparing " + name + " against " + // + propertyDescriptors[i].getName()); if (name.equals(propertyDescriptors[i].getName())) { + //System.out.println("matched"); return propertyDescriptors[i]; } }

1 0

Access logs available from
by Ceki Gülcü 25 Oct '06

25 Oct '06

Hello Sebastien, Access logs for the translator web-app are available at: http://logback.qos.ch/translator/logs/access.html I had to use a modified pattern: <Pattern>%h%i{x-forwarded-for}%l%u%t%r%s%b</Pattern> Note that %i{X-Forwarded-For} is replaced by i{x-forwarded-for}. Apparently, Tomcat puts the header names in lower case. I say Tomcat because the Http request contains the header "X-Forwarded-For" as can be seen from the TCP conversation below: GET /translator/Welcome.do HTTP/1.1 Host: logback.qos.ch:8080 User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.12) Gecko/20060528 Firefox/1.0.7 Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 Accept-Language: en-us,en;q=0.5 Accept-Encoding: gzip,deflate Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7 Referer: http://logback.qos.ch/bugreport.html Cookie: JSESSIONID=7D4E9DEBEF1F18B9D8AB7E8E42FF70BA Max-Forwards: 10 X-Forwarded-For: 212.74.184.209 X-Forwarded-Host: logback.qos.ch X-Forwarded-Server: logback.qos.ch -- Ceki Gülcü Logback: The reliable, generic, fast and flexible logging framework for Java. http://logback.qos.ch

1 0

svn commit: r778 - logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty
by noreply.ceki＠qos.ch 25 Oct '06

25 Oct '06

Author: ceki Date: Wed Oct 25 21:09:49 2006 New Revision: 778 Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java Log: changed port to 8089 Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java Wed Oct 25 21:09:49 2006 @@ -28,7 +28,7 @@ public class JettyTestSetup extends TestSetup { RequestLogImpl requestLogImpl; - public static final int PORT = 8088; + public static final int PORT = 8089; public JettyTestSetup(Test suite, RequestLogImpl impl) { super(suite);

1 0

svn commit: r777 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/html logback-classic/src/main/java/ch/qos/logback/classic/html logback-core/src/main/java/ch/qos/logback/core/html
by noreply.seb＠qos.ch 25 Oct '06

25 Oct '06

Author: seb Date: Wed Oct 25 17:12:50 2006 New Revision: 777 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/UrlCssBuilder.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java Removed: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/DefaultCssBuilder.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/UrlCssBuilder.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java Log: created module specific implementations of UrlCssBuilder.java and DefaultCssBuilder.java removed core module classes Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/DefaultCssBuilder.java Wed Oct 25 17:12:50 2006 @@ -0,0 +1,80 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.access.html; + +import static ch.qos.logback.core.Layout.LINE_SEP; +import ch.qos.logback.core.html.CssBuilder; + +/** + * This class helps the HTMLLayout build the CSS link. It either provides the + * HTMLLayout with a default css file, or builds the link to an external, + * user-specified, file. + * + * @author Sébastien Pennec + */ +public class DefaultCssBuilder implements CssBuilder { + + public DefaultCssBuilder() { + } + + public void addCss(StringBuffer sbuf) { + sbuf.append("<STYLE type=\"text/css\">"); + sbuf.append(" table { "); + sbuf.append(" margin-left: 2em; "); + sbuf.append(" margin-right: 2em; "); + sbuf.append(" border-left: 2px solid #AAA; "); + sbuf.append("}"); + sbuf.append(LINE_SEP); + sbuf.append("TR.even { "); + sbuf.append(" background: #FFFFFF; "); + sbuf.append("}"); + sbuf.append(LINE_SEP); + sbuf.append("TR.odd { "); + sbuf.append(" background: #EAEAEA; "); + sbuf.append("}"); + sbuf.append(LINE_SEP); + sbuf.append("TD { "); + sbuf.append(" padding-right: 1ex; "); + sbuf.append(" padding-left: 1ex; "); + sbuf.append(" border-right: 2px solid #AAA;"); + sbuf.append("}"); + sbuf.append(LINE_SEP); + sbuf.append("TD.Time, TD.Date { "); + sbuf.append(" text-align: right; "); + sbuf.append(" font-family: courier, monospace; "); + sbuf.append(" font-size: smaller; "); + sbuf.append("}"); + sbuf.append(LINE_SEP); + sbuf + .append("TD.RemoteHost, TD.RequestProtocol, TD.RequestHeader, TD.RequestURL, TD.RemoteUser, TD.RequestURI, TD.ServerName {"); + sbuf.append(" text-align: left; "); + sbuf.append("}"); + sbuf.append(LINE_SEP); + sbuf + .append("TD.RequestAttribute, TD.RequestCookie, TD.ResponseHeader, TD.RequestParameter {"); + sbuf.append(" text-align: left; "); + sbuf.append("}"); + sbuf.append(LINE_SEP); + sbuf + .append("TD.RemoteIPAddress, TD.LocalIPAddress, TD.ContentLength, TD.StatusCode, TD.LocalPort {"); + sbuf.append(" text-align: right; "); + sbuf.append("}"); + sbuf.append(LINE_SEP); + sbuf.append("TR.header { "); + sbuf.append(" background: #596ED5; "); + sbuf.append(" color: #FFF; "); + sbuf.append(" font-weight: bold; "); + sbuf.append(" font-size: larger; "); + sbuf.append("}"); + sbuf.append(LINE_SEP); + sbuf.append(" }"); + sbuf.append("}"); + } +} \ No newline at end of file Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/HTMLLayout.java Wed Oct 25 17:12:50 2006 @@ -15,7 +15,7 @@ import ch.qos.logback.access.AccessLayout; import ch.qos.logback.access.PatternLayout; import ch.qos.logback.access.spi.AccessEvent; -import ch.qos.logback.core.html.DefaultCssBuilder; +import ch.qos.logback.access.html.DefaultCssBuilder; import ch.qos.logback.core.html.HTMLLayoutBase; import ch.qos.logback.core.html.NOPThrowableRenderer; import ch.qos.logback.core.pattern.Converter; Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/UrlCssBuilder.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/html/UrlCssBuilder.java Wed Oct 25 17:12:50 2006 @@ -0,0 +1,42 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.access.html; + +import ch.qos.logback.core.html.CssBuilder; + + +/** + * This class helps the HTMLLayout build the CSS link. + * It either provides the HTMLLayout with a default css file, + * or builds the link to an external, user-specified, file. + * + * @author Sébastien Pennec + */ +public class UrlCssBuilder implements CssBuilder { + + String url = "http://logback.qos.ch/css/access.css"; + + public UrlCssBuilder() { + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public void addCss(StringBuffer sbuf) { + sbuf.append("<LINK REL=StyleSheet HREF=\""); + sbuf.append(url); + sbuf.append("\" TITLE=\"Basic\" />"); + } +} Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/DefaultCssBuilder.java Wed Oct 25 17:12:50 2006 @@ -0,0 +1,72 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.classic.html; + +import static ch.qos.logback.core.Layout.LINE_SEP; +import ch.qos.logback.core.html.CssBuilder; + +/** + * This class helps the HTMLLayout build the CSS link. It either provides the + * HTMLLayout with a default css file, or builds the link to an external, + * user-specified, file. + * + * @author Sébastien Pennec + */ +public class DefaultCssBuilder implements CssBuilder { + + public DefaultCssBuilder() { + } + + public void addCss(StringBuffer sbuf) { + sbuf.append("<STYLE type=\"text/css\">"); + sbuf.append(LINE_SEP); + sbuf + .append("table { margin-left: 2em; margin-right: 2em; border-left: 2px solid #AAA; }"); + sbuf.append(LINE_SEP); + + sbuf.append("TR.even { background: #FFFFFF; }"); + sbuf.append(LINE_SEP); + + sbuf.append("TR.odd { background: #EAEAEA; }"); + sbuf.append(LINE_SEP); + + sbuf + .append("TR.warn TD.Level, TR.error TD.Level, TR.fatal TD.Level {font-weight: bold; color: #FF4040 }"); + sbuf.append(LINE_SEP); + + sbuf + .append("TD { padding-right: 1ex; padding-left: 1ex; border-right: 2px solid #AAA; }"); + sbuf.append(LINE_SEP); + + sbuf + .append("TD.Time, TD.Date { text-align: right; font-family: courier, monospace; font-size: smaller; }"); + sbuf.append(LINE_SEP); + + sbuf.append("TD.Thread { text-align: left; }"); + sbuf.append(LINE_SEP); + + sbuf.append("TD.Level { text-align: right; }"); + sbuf.append(LINE_SEP); + + sbuf.append("TD.Logger { text-align: left; }"); + sbuf.append(LINE_SEP); + + sbuf + .append("TR.header { background: #596ED5; color: #FFF; font-weight: bold; font-size: larger; }"); + sbuf.append(LINE_SEP); + + sbuf + .append("TD.Exception { background: #A2AEE8; font-family: courier, monospace;}"); + sbuf.append(LINE_SEP); + + sbuf.append("</STYLE>"); + sbuf.append(LINE_SEP); + } +} Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/HTMLLayout.java Wed Oct 25 17:12:50 2006 @@ -15,7 +15,7 @@ import ch.qos.logback.classic.ClassicLayout; import ch.qos.logback.classic.PatternLayout; import ch.qos.logback.classic.spi.LoggingEvent; -import ch.qos.logback.core.html.DefaultCssBuilder; +import ch.qos.logback.classic.html.DefaultCssBuilder; import ch.qos.logback.core.html.HTMLLayoutBase; import ch.qos.logback.core.pattern.Converter; Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/UrlCssBuilder.java Wed Oct 25 17:12:50 2006 @@ -0,0 +1,42 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.classic.html; + +import ch.qos.logback.core.html.CssBuilder; + + +/** + * This class helps the HTMLLayout build the CSS link. + * It either provides the HTMLLayout with a default css file, + * or builds the link to an external, user-specified, file. + * + * @author Sébastien Pennec + */ +public class UrlCssBuilder implements CssBuilder { + + String url = "http://logback.qos.ch/css/classic.css"; + + public UrlCssBuilder() { + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public void addCss(StringBuffer sbuf) { + sbuf.append("<LINK REL=StyleSheet HREF=\""); + sbuf.append(url); + sbuf.append("\" TITLE=\"Basic\" />"); + } +}

1 0

svn commit: r776 - in logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran: action spi
by noreply.ceki＠qos.ch 25 Oct '06

25 Oct '06

Author: ceki Date: Wed Oct 25 17:06:14 2006 New Revision: 776 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java Log: minor changes Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderAction.java Wed Oct 25 17:06:14 2006 @@ -1,7 +1,7 @@ /** - * LOGBack: the generic, reliable, fast and flexible logging framework. + * Logback: the generic, reliable, fast and flexible logging framework for Java. * - * Copyright (C) 1999-2006, QOS.ch + * Copyright (C) 2000-2006, QOS.ch * * This library is free software, you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free @@ -54,7 +54,7 @@ "No appender name given for appender of type " + className + "]."); } else { appender.setName(appenderName); - addInfo("Appender named as [" + appenderName + "]"); + addInfo("Naming appender as [" + appenderName + "]"); } // The execution context contains a bag which contains the appenders Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java Wed Oct 25 17:06:14 2006 @@ -141,5 +141,17 @@ return null; } } + + public String toString() { + final String TAB = " "; + + StringBuilder retValue = new StringBuilder(); + + retValue.append("SimpleRuleStore ( ") + .append("rules = ").append(this.rules).append(TAB) + .append(" )"); + + return retValue.toString(); + } }

1 0