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 2012/06/05 23:40:21 UTC
svn commit: r1346608 - in
/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki:
FusekiCmd.java server/SPARQLServer.java server/ServerConfig.java
servlets/SPARQL_Update.java
Author: andy
Date: Tue Jun 5 21:40:20 2012
New Revision: 1346608
URL: http://svn.apache.org/viewvc?rev=1346608&view=rev
Log:
Enable verbose/debug logging.
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/ServerConfig.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?rev=1346608&r1=1346607&r2=1346608&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java Tue Jun 5 21:40:20 2012
@@ -373,6 +373,7 @@ public class FusekiCmd extends CmdARQ
serverConfig.pagesPort = port ;
serverConfig.enableCompression = enableCompression ;
serverConfig.jettyConfigFile = jettyConfigFile ;
+ serverConfig.verboseLogging = ( super.isVerbose() || super.isDebug() ) ;
SPARQLServer server = new SPARQLServer(serverConfig) ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java?rev=1346608&r1=1346607&r2=1346608&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java Tue Jun 5 21:40:20 2012
@@ -62,12 +62,13 @@ public class SPARQLServer
private ServerConfig serverConfig ;
private Server server = null ;
- private boolean verbose = false ;
+ private boolean verboseLogging = false ;
//private static int ThreadPoolSize = 100 ;
public SPARQLServer(ServerConfig config)
{
- this.serverConfig = config ;
+ this.serverConfig = config ;
+ verboseLogging = config.verboseLogging ;
// GZip compression
// Note that regardless of this setting we'll always leave it turned off for the servlets
@@ -224,11 +225,11 @@ public class SPARQLServer
DatasetRegistry.get().put(datasetPath, sDesc) ;
serverLog.info(format("Dataset path = %s", datasetPath)) ;
- HttpServlet sparqlQuery = new SPARQL_QueryDataset(verbose) ;
- HttpServlet sparqlUpdate = new SPARQL_Update(verbose) ;
- HttpServlet sparqlUpload = new SPARQL_Upload(verbose) ;
- HttpServlet sparqlHttpR = new SPARQL_REST_R(verbose) ;
- HttpServlet sparqlHttpRW = new SPARQL_REST_RW(verbose) ;
+ HttpServlet sparqlQuery = new SPARQL_QueryDataset(verboseLogging) ;
+ HttpServlet sparqlUpdate = new SPARQL_Update(verboseLogging) ;
+ HttpServlet sparqlUpload = new SPARQL_Upload(verboseLogging) ;
+ HttpServlet sparqlHttpR = new SPARQL_REST_R(verboseLogging) ;
+ HttpServlet sparqlHttpRW = new SPARQL_REST_RW(verboseLogging) ;
addServlet(context, datasetPath, sparqlQuery, sDesc.queryEP, enableCompression) ;
addServlet(context, datasetPath, sparqlUpdate, sDesc.updateEP, false) ; // No point - no results of any size.
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/ServerConfig.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/ServerConfig.java?rev=1346608&r1=1346607&r2=1346608&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/ServerConfig.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/ServerConfig.java Tue Jun 5 21:40:20 2012
@@ -43,5 +43,9 @@ public class ServerConfig
public List<DatasetRef> services ;
/** Enable Accept-Encoding compression */
public boolean enableCompression = false ;
+
+ /** Enable additional logging */
+ public boolean verboseLogging = false ;
+
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java?rev=1346608&r1=1346607&r2=1346608&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java Tue Jun 5 21:40:20 2012
@@ -185,7 +185,8 @@ public class SPARQL_Update extends SPARQ
UpdateRequest req ;
try {
- if ( action.verbose )
+
+ if ( super.verbose_debug || action.verbose )
{
// Verbose mode only .... capture request for logging (does not scale).
// Content-Length.
@@ -213,7 +214,7 @@ public class SPARQL_Update extends SPARQ
if ( requestStr == null )
requestStr = action.request.getParameter(paramRequest) ;
- if ( action.verbose )
+ if ( super.verbose_debug || action.verbose )
requestLog.info(format("[%d] Form update = %s", action.id, formatForLog(requestStr))) ;
UpdateRequest req ;