Repository: jena Updated Branches: refs/heads/master 824a89a08 -> 3b77e7bcd
Structure for request logging, NCSA format. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3b77e7bc Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3b77e7bc Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3b77e7bc Branch: refs/heads/master Commit: 3b77e7bcd45887887b5e59b6a7b0a8cff847be41 Parents: 824a89a Author: Andy Seaborne <a...@apache.org> Authored: Fri Oct 24 17:34:19 2014 +0100 Committer: Andy Seaborne <a...@apache.org> Committed: Fri Oct 24 17:34:19 2014 +0100 ---------------------------------------------------------------------- jena-fuseki2/run-fuseki | 3 +-- .../java/org/apache/jena/fuseki/Fuseki.java | 23 ++++++++++---------- .../org/apache/jena/fuseki/FusekiLogging.java | 12 ++++++++-- .../apache/jena/fuseki/servlets/ActionBase.java | 2 ++ .../apache/jena/fuseki/servlets/HttpAction.java | 2 +- .../src/main/resources/log4j.properties | 21 +++++++++++++++++- 6 files changed, 46 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/3b77e7bc/jena-fuseki2/run-fuseki ---------------------------------------------------------------------- diff --git a/jena-fuseki2/run-fuseki b/jena-fuseki2/run-fuseki index 588c4a0..54191d3 100755 --- a/jena-fuseki2/run-fuseki +++ b/jena-fuseki2/run-fuseki @@ -17,7 +17,6 @@ # limitations under the License. ## Run Fuseki, include development code if it looks like it's available. -## Or --pages= function check_dir() { local NAME="$1" @@ -75,4 +74,4 @@ JVM_ARGS="${JVM_ARGS:--Xmx1200M}" exec java -cp "$CP" $JVM_ARGS $FUSEKI_LOG org.apache.jena.fuseki.FusekiCmd "$@" # Run as war file. -# java -jar jetty-runner.jar fuseki-server.war \ No newline at end of file +# java -jar jetty-runner.jar fuseki-server.war http://git-wip-us.apache.org/repos/asf/jena/blob/3b77e7bc/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java index b2bea5b..b2f4e05 100644 --- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java +++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java @@ -105,31 +105,32 @@ public class Fuseki { public static final String requestLogName = PATH + ".Request" ; // See HttpAction.finishRequest. - /** Instance of log for operations */ - public static final Logger requestLog = null ; // LoggerFactory.getLogger(requestLogName) ; - - /** Admin log file for operations */ + // Normally OFF + /** Instance of a log for requests: format is NCSA. */ + public static final Logger requestLog = LoggerFactory.getLogger(requestLogName) ; + + /** Admin log file for operations. */ public static final String adminLogName = PATH + ".Admin" ; - /** Instance of log for operations */ + /** Instance of log for operations. */ public static final Logger adminLog = LoggerFactory.getLogger(adminLogName) ; - /** Admin log file for operations */ + /** Admin log file for operations. */ public static final String builderLogName = PATH + ".Builder" ; - /** Instance of log for operations */ + /** Instance of log for operations. */ public static final Logger builderLog = LoggerFactory.getLogger(builderLogName) ; - /** Validation log file for operations */ + /** Validation log file for operations. */ public static final String validationLogName = PATH + ".Validate" ; - /** Instance of log for validation */ + /** Instance of log for validation. */ public static final Logger validationLog = LoggerFactory.getLogger(adminLogName) ; /** Actual log file for general server messages. */ public static final String serverLogName = PATH + ".Server" ; - /** Instance of log for general server messages */ + /** Instance of log for general server messages. */ public static final Logger serverLog = LoggerFactory.getLogger(serverLogName) ; /** Logger used for the servletContent.log operations (if settable -- depends on environment) */ @@ -138,7 +139,7 @@ public class Fuseki { /** Actual log file for config server messages. */ public static final String configLogName = PATH + ".Config" ; - /** Instance of log for config server message s */ + /** Instance of log for config server messages. */ public static final Logger configLog = LoggerFactory.getLogger(configLogName) ; /** Instance of log for config server message s */ http://git-wip-us.apache.org/repos/asf/jena/blob/3b77e7bc/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLogging.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLogging.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLogging.java index 38400c5..570e8e5 100644 --- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLogging.java +++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLogging.java @@ -52,7 +52,7 @@ public class FusekiLogging "# System logs.", "log4j.logger." + Fuseki.serverLogName + "=INFO", - "log4j.logger." + Fuseki.actionLogName + "=INFO", + "log4j.logger." + Fuseki.actionLogName + "=INFO", "log4j.logger." + Fuseki.adminLogName + "=INFO", "log4j.logger." + Fuseki.validationLogName + "=INFO", "log4j.logger." + Fuseki.configLogName + "=INFO", @@ -61,9 +61,17 @@ public class FusekiLogging "log4j.logger.org.eclipse.jetty=WARN" , "log4j.logger.org.apache.shiro=WARN", + "# NCSA RequestAccess log", + "log4j.appender.plain=org.apache.log4j.ConsoleAppender", + "log4j.appender.plain.target=System.out", + "log4j.appender.plain.layout=org.apache.log4j.PatternLayout", + "log4j.appender.plain.layout.ConversionPattern=%m%n", + "log4j.additivity."+Fuseki.requestLogName + "=false", + "log4j.logger."+Fuseki.requestLogName + "=OFF, plain", + "## Parser output", "log4j.additivity" + SysRIOT.riotLoggerName + "=false", - "log4j.logger." + SysRIOT.riotLoggerName + "=INFO, jena.plainstdout" + "log4j.logger." + SysRIOT.riotLoggerName + "=INFO, plainstdout" ) ; // Set logging. http://git-wip-us.apache.org/repos/asf/jena/blob/3b77e7bc/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java index 18d4c82..3e45c78 100644 --- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java +++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java @@ -236,6 +236,8 @@ public abstract class ActionBase extends ServletBase HttpSC.getMessage(action.statusCode), timeStr)) ; else log.info(String.format("[%d] %d %s (%s) ", action.id, action.statusCode, action.message, timeStr)) ; + + // See also HttpAction.finishRequest - request logging happens there. } /** http://git-wip-us.apache.org/repos/asf/jena/blob/3b77e7bc/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java index 1086848..2857c39 100644 --- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java +++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java @@ -286,7 +286,7 @@ public class HttpAction if ( dataAccessPoint != null ) dataAccessPoint.finishRequest(this) ; // Standard logging goes here. - if ( Fuseki.requestLog != null ) { + if ( Fuseki.requestLog != null && Fuseki.requestLog.isInfoEnabled() ) { String s = RequestLog.combinedNCSA(this) ; Fuseki.requestLog.info(s); } http://git-wip-us.apache.org/repos/asf/jena/blob/3b77e7bc/jena-fuseki2/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/jena-fuseki2/src/main/resources/log4j.properties b/jena-fuseki2/src/main/resources/log4j.properties index 6da6301..b5fb04a 100644 --- a/jena-fuseki2/src/main/resources/log4j.properties +++ b/jena-fuseki2/src/main/resources/log4j.properties @@ -5,25 +5,44 @@ log4j.appender.jena.plainstdout=org.apache.log4j.ConsoleAppender log4j.appender.jena.plainstdout.target=System.out log4j.appender.jena.plainstdout.layout=org.apache.log4j.PatternLayout log4j.appender.jena.plainstdout.layout.ConversionPattern=%d{HH:mm:ss} %-10c{1} %-5p %m%n + # Plain output to stderr log4j.appender.jena.plainstderr=org.apache.log4j.ConsoleAppender log4j.appender.jena.plainstderr.target=System.err log4j.appender.jena.plainstderr.layout=org.apache.log4j.PatternLayout log4j.appender.jena.plainstderr.layout.ConversionPattern=%d{HH:mm:ss} %-10c{1} %-5p %m%n -# Everything + +# Unadorned, for the requets log. +log4j.appender.fuseki.plain=org.apache.log4j.ConsoleAppender +log4j.appender.fuseki.plain.target=System.out +log4j.appender.fuseki.plain.layout=org.apache.log4j.PatternLayout +log4j.appender.fuseki.plain.layout.ConversionPattern=%d{HH:mm:ss} %-10c{1} %-5p %m%n + + log4j.rootLogger=INFO, jena.plainstdout log4j.logger.com.hp.hpl.jena=WARN log4j.logger.org.apache.jena=WARN log4j.logger.org.apache.jena.fuseki=INFO + # Others log4j.logger.org.eclipse.jetty=WARN log4j.logger.org.apache.shiro=WARN + # Fuseki System logs. log4j.logger.org.apache.jena.fuseki.Server=INFO log4j.logger.org.apache.jena.fuseki.Fuseki=INFO log4j.logger.org.apache.jena.fuseki.Admin=INFO log4j.logger.org.apache.jena.fuseki.Validate=INFO log4j.logger.org.apache.jena.fuseki.Config=INFO + +# NCSA Request log. +log4j.appender.plain=org.apache.log4j.ConsoleAppender +log4j.appender.plain.target=System.out +log4j.appender.plain.layout=org.apache.log4j.PatternLayout +log4j.appender.plain.layout.ConversionPattern=%m%n +log4j.additivity.org.apache.jena.fuseki.Request=false +log4j.logger.org.apache.jena.fuseki.Request=OFF, fuseki.plain + # TDB log4j.logger.org.apache.jena.tdb.loader=INFO ## Parser output
