You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/12/17 22:01:24 UTC
jena git commit: Logging: [date+time] format
Repository: jena
Updated Branches:
refs/heads/master 062240a79 -> 4ea4846cb
Logging: [date+time] format
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4ea4846c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4ea4846c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4ea4846c
Branch: refs/heads/master
Commit: 4ea4846cba582e40c2926ab477e83dc9c832dc0c
Parents: 062240a
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Dec 17 21:01:12 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Dec 17 21:01:12 2014 +0000
----------------------------------------------------------------------
jena-fuseki2/fuseki-dev | 2 +-
.../java/org/apache/jena/fuseki/Fuseki.java | 1 +
.../java/org/apache/jena/fuseki/FusekiCmd.java | 17 ++++---
.../org/apache/jena/fuseki/FusekiLogging.java | 50 ++++++++++++--------
.../src/main/resources/log4j.properties | 17 ++++---
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 4 +-
6 files changed, 54 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4ea4846c/jena-fuseki2/fuseki-dev
----------------------------------------------------------------------
diff --git a/jena-fuseki2/fuseki-dev b/jena-fuseki2/fuseki-dev
index b75e35e..460c84b 100755
--- a/jena-fuseki2/fuseki-dev
+++ b/jena-fuseki2/fuseki-dev
@@ -68,7 +68,7 @@ do
fi
done
-FUSEKI_LOG=${FUSEKI_LOG:-}
+FUSEKI_LOG="" #${FUSEKI_LOG:-}
JVM_ARGS="${JVM_ARGS:--Xmx1200M}"
exec java -cp "$CP" $JVM_ARGS $FUSEKI_LOG org.apache.jena.fuseki.FusekiCmd "$@"
http://git-wip-us.apache.org/repos/asf/jena/blob/4ea4846c/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 701fb20..ac9bef9 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
@@ -208,6 +208,7 @@ public class Fuseki {
// Don't set TDB batch commits.
// This can be slower, but it less memory hungry and more predictable.
TransactionManager.QueueBatchSize = 0 ;
+ FusekiLogging.setLogging() ;
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/4ea4846c/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiCmd.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
index 5394bea..d04b8e5 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
@@ -47,18 +47,23 @@ public class FusekiCmd {
// FusekiCmdInner inherits from CmdMain which statically sets logging.
// By java classloading, super class statics run before the
// statics of a class are run.
- // (Cmd logging should be done lower down but it's normally convenient
- // to have to set in all circumstances).
- static { FusekiLogging.setLogging() ; }
+ static {
+ // If this is not set, log4j initializes beause LogManger is touched,
+ // which find the src/main/resources/log4j.properties
+ //System.setProperty("log4j.configuration", "file:log4j.properties") ;
+ FusekiLogging.setLogging() ;
+ }
static public void main(String... argv) {
- FusekiCmdInner.main(argv);
+ FusekiCmdInner.innerMain(argv);
}
static class FusekiCmdInner extends CmdARQ {
- // Legacy.
+ // --mgt. --mgtPort :: Legacy.
private static ArgDecl argMgt = new ArgDecl(ArgDecl.NoValue, "mgt") ;
private static ArgDecl argMgtPort = new ArgDecl(ArgDecl.HasValue, "mgtPort", "mgtport") ;
+
+ // --home :: Legacy - do not use.
private static ArgDecl argHome = new ArgDecl(ArgDecl.HasValue, "home") ;
private static ArgDecl argPages = new ArgDecl(ArgDecl.HasValue, "pages") ;
@@ -82,7 +87,7 @@ public class FusekiCmd {
// fuseki [--mem|--desc assembler.ttl] [--port PORT] **** /datasetURI
- static public void main(String... argv) {
+ static public void innerMain(String... argv) {
// Just to make sure ...
ARQ.init() ;
TDB.init() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/4ea4846c/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 badaeab..707cc5d 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
@@ -30,17 +30,21 @@ import org.apache.log4j.helpers.Loader ;
public class FusekiLogging
{
private static String log4Jsetup = StrUtils.strjoinNL
+ // Preferred: classes/log4j.properties, from src/main/resources/log4j.properties
+ // Keep these in-step. Different usages cause different logging initalizations.
("## Plain output to stdout",
"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",
+ "log4j.appender.jena.plainstdout.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %-10c{1} %-5p %m%n",
+ //"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",
+ //"log4j.appender.jena.plainstderr.layout.ConversionPattern=%d{HH:mm:ss} %-10c{1} %-5p %m%n",
+ "log4j.appender.jena.plainstderr.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %-10c{1} %-5p %m%n",
"## Everything",
"log4j.rootLogger=INFO, jena.plainstdout",
@@ -67,7 +71,7 @@ public class FusekiLogging
"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",
+ "log4j.logger."+Fuseki.requestLogName + "=INFO, plain",
"## Parser output",
"log4j.additivity" + SysRIOT.riotLoggerName + "=false",
@@ -79,62 +83,68 @@ public class FusekiLogging
// 2/ Use file:log4j.properties
// 3/ Use log4j.properties on the classpath.
// 4/ Use Built in.
+ // Using FusekiCmd causes
private static boolean LogLogging = false ;
+ private static boolean loggingInitialized = false ;
public static void setLogging() {
- if ( LogLogging )
- System.err.println("Fuseki logging") ;
+ if ( loggingInitialized )
+ return ;
+ loggingInitialized = true ;
+
+ logLogging("Fuseki logging") ;
// No loggers have been created but configuration may have been set up.
String x = System.getProperty("log4j.configuration", null) ;
- if ( LogLogging )
- System.err.println("log4j.configuration = " + x) ;
+ logLogging("log4j.configuration = %s", x) ;
if ( x != null ) // && !x.equals("set") )
// Punt to log4j proper, or maybe already set.
// "set" indicates that logging was set before.
return ;
- if ( LogLogging )
- System.err.println("Fuseki logging - setup") ;
+ logLogging("Fuseki logging - setup") ;
// Look for a log4j.properties in the current working directory for easy
// customization.
try {
- if ( LogLogging )
- System.err.println("Fuseki logging - look for local log4j.properties") ;
+ logLogging("Fuseki logging - look for local log4j.properties") ;
String fn = "log4j.properties" ;
File f = new File(fn) ;
if ( f.exists() ) {
- if ( LogLogging )
- System.err.println("Fuseki logging - found file:log4j.properties") ;
+ logLogging("Fuseki logging - found file:log4j.properties") ;
PropertyConfigurator.configure(fn) ;
System.setProperty("log4j.configuration", "file:" + fn) ;
return ;
}
- if ( LogLogging )
- System.err.println("Fuseki logging - no local log4j.properties") ;
+ logLogging("Fuseki logging - no local log4j.properties") ;
}
catch (Throwable th) {}
// Try log4j.properties
- // The log4j general is initialization done in a class static
+ // The log4j general initialization is done in a class static
// in LogManager so it can't be called again in any sensible manner.
// Instead, we include the same basic mechanism ...
- if ( LogLogging )
- System.err.println("Fuseki logging - look for URL log4j.properties") ;
+ logLogging("Fuseki logging - look for URL log4j.properties") ;
URL url = Loader.getResource("log4j.properties") ;
if ( url != null ) {
PropertyConfigurator.configure(url) ;
+ logLogging("Fuseki logging - found = %s", url) ;
System.setProperty("log4j.configuration", url.toString()) ;
return ;
}
- if ( LogLogging )
- System.err.println("Fuseki logging - LogCtl.resetLogging") ;
+ logLogging("Fuseki logging - Use built-in") ;
// Use builtin.
LogCtl.resetLogging(log4Jsetup) ;
// Stop anything attempting to do it again.
System.setProperty("log4j.configuration", "set") ;
}
+
+ private static void logLogging(String fmt, Object ... args) {
+ if ( LogLogging ) {
+ System.out.printf(fmt, args) ;
+ System.out.println() ;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/4ea4846c/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 b5fb04a..c7f8bb3 100644
--- a/jena-fuseki2/src/main/resources/log4j.properties
+++ b/jena-fuseki2/src/main/resources/log4j.properties
@@ -4,20 +4,22 @@
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
+log4j.appender.jena.plainstdout.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %-10c{1} %-5p %m%n
+##
+## %d{ISO8601} -- includes "ss,sss"
+## log4j.appender.jena.plainstdout.layout.ConversionPattern=[%d{ISO8601}] %-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
+log4j.appender.jena.plainstderr.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %-10c{1} %-5p %m%n
-# Unadorned, for the requets log.
+# Unadorned, for the requests 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.appender.fuseki.plain.layout.ConversionPattern=%m%n
log4j.rootLogger=INFO, jena.plainstdout
log4j.logger.com.hp.hpl.jena=WARN
@@ -36,12 +38,9 @@ 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
+log4j.logger.org.apache.jena.fuseki.Request=INFO, fuseki.plain
# TDB
log4j.logger.org.apache.jena.tdb.loader=INFO
http://git-wip-us.apache.org/repos/asf/jena/blob/4ea4846c/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java b/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
index 4c31fa9..ea9fef2 100644
--- a/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
+++ b/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
@@ -53,6 +53,8 @@ public class TS_Fuseki extends ServerTest
LogCtl.logLevel(Fuseki.configLogName, WARN1, WARN2);
LogCtl.logLevel(Fuseki.adminLogName, WARN1, WARN2);
LogCtl.logLevel(Fuseki.builderLogName, WARN1, WARN2);
- LogCtl.logLevel(Fuseki.actionLogName, WARN1, WARN2);
+ LogCtl.logLevel(Fuseki.actionLogName, WARN1, WARN2);
+ LogCtl.logLevel(Fuseki.requestLogName, WARN1, WARN2);
+ LogCtl.logLevel(Fuseki.servletRequestLogName, WARN1, WARN2);
}
}
\ No newline at end of file