Author: andy
Date: Mon Sep 9 14:34:01 2013
New Revision: 1521137
URL: http://svn.apache.org/r1521137
Log:
Control test logging via log4j.properties only
Added:
jena/trunk/jena-fuseki/src/test/resources/
jena/trunk/jena-fuseki/src/test/resources/log4j.properties
Modified:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java
Modified:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java?rev=1521137&r1=1521136&r2=1521137&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java
(original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java
Mon Sep 9 14:34:01 2013
@@ -18,7 +18,6 @@
package org.apache.jena.fuseki;
-import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.fuseki.server.FusekiConfig ;
import org.apache.jena.fuseki.server.SPARQLServer ;
import org.apache.jena.fuseki.server.ServerConfig ;
@@ -72,9 +71,6 @@ public class ServerTest
private static SPARQLServer server = null ;
- // reference count of start/stop server logging
- private static int countLogging = 0 ;
-
// reference count of start/stop server
private static int countServer = 0 ;
@@ -84,10 +80,6 @@ public class ServerTest
static public void allocServer()
{
- if ( countLogging == 0 )
- serverStartLogging() ;
- countLogging++ ;
-
if ( countServer == 0 )
setupServer() ;
countServer++ ;
@@ -100,11 +92,6 @@ public class ServerTest
if ( countServer == 0 )
teardownServer() ;
}
- if ( countLogging >= 0 ) {
- countLogging-- ;
- if ( countLogging == 0 )
- serverStopLogging() ;
- }
}
protected static void setupServer()
@@ -123,23 +110,6 @@ public class ServerTest
server.stop() ;
server = null ;
}
-
- // For tests, the server sits in the background
- // Set logging to WARN only.
-
- protected static void serverStartLogging() {
- Log.logLevel(Fuseki.serverLog.getName(), org.apache.log4j.Level.WARN,
java.util.logging.Level.WARNING) ;
- Log.logLevel(Fuseki.requestLog.getName(), org.apache.log4j.Level.WARN,
java.util.logging.Level.WARNING) ;
- Log.logLevel("org.eclipse.jetty", org.apache.log4j.Level.WARN,
java.util.logging.Level.WARNING) ;
-
- }
-
- protected static void serverStopLogging() {
- Log.logLevel(Fuseki.serverLog.getName(), org.apache.log4j.Level.INFO,
java.util.logging.Level.INFO) ;
- Log.logLevel(Fuseki.requestLog.getName(), org.apache.log4j.Level.INFO,
java.util.logging.Level.INFO) ;
- Log.logLevel("org.eclipse.jetty", org.apache.log4j.Level.INFO,
java.util.logging.Level.INFO) ;
- }
-
public static void resetServer()
{
Update clearRequest = new UpdateDrop(Target.ALL) ;
Added: jena/trunk/jena-fuseki/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/resources/log4j.properties?rev=1521137&view=auto
==============================================================================
--- jena/trunk/jena-fuseki/src/test/resources/log4j.properties (added)
+++ jena/trunk/jena-fuseki/src/test/resources/log4j.properties Mon Sep 9
14:34:01 2013
@@ -0,0 +1,20 @@
+log4j.rootLogger=INFO,stdlog
+
+log4j.appender.stdlog=org.apache.log4j.ConsoleAppender
+log4j.appender.stdlog.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdlog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-25c{1} ::
%m%n
+
+# Jena Dependency log levels
+log4j.logger.com.hp.hpl.jena.arq.info=INFO
+log4j.logger.com.hp.hpl.jena.arq.exec=INFO
+log4j.logger.com.hp.hpl.jena=WARN
+log4j.logger.org.apache.jena=WARN
+log4j.logger.org.apache.jena.riot=INFO
+
+# Jetty - Fuseki catches Jetty errors and reports them.
+log4j.logger.org.eclipse.jetty=FATAL
+
+# Fuseki
+log4j.logger.org.apache.jena.fuseki.Server=WARN
+log4j.logger.org.apache.jena.fuseki.Fuseki=WARN
+log4j.logger.org.apache.jena.fuseki=WARN
\ No newline at end of file
