From fbd22952b674ea9d7f993d9feca747a943aae310 Mon Sep 17 00:00:00 2001
From: Guillaume Lederrey <guillaume.lederrey@gmail.com>
Date: Thu, 18 Oct 2018 23:41:42 +0200
Subject: [PATCH] BLZG-9177 Use slf4j for logging errors in BigdataRDFServlet

* migrate logger to slf4j (this should be transparent for all use cases,
blazegraph already packages slf4j-log4j12)
* replace string concatenation in log message with placeholders (this
  will allow better management of logs, since message format will
  be available in log processin)

Change-Id: Ic4c2ba04ae0be35396929e468b7c54cb716af53d
---
 .../rdf/sail/webapp/BigdataRDFServlet.java       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java
index d89335ab62..0118a99908 100644
--- a/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java
+++ b/bigdata-core/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java
@@ -48,7 +48,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.log4j.Logger;
 import org.openrdf.model.Graph;
 import org.openrdf.model.Resource;
 import org.openrdf.model.Statement;
@@ -60,6 +59,8 @@
 import org.openrdf.rio.RDFWriter;
 import org.openrdf.rio.RDFWriterFactory;
 import org.openrdf.rio.RDFWriterRegistry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.bigdata.journal.IAtomicStore;
 import com.bigdata.rdf.properties.PropertiesFormat;
@@ -83,7 +84,7 @@ abstract public class BigdataRDFServlet extends BigdataServlet {
      */
     private static final long serialVersionUID = 1L;
 
-    static private final transient Logger log = Logger.getLogger(BigdataRDFServlet.class);
+    static private final transient Logger log = LoggerFactory.getLogger(BigdataRDFServlet.class);
 
     /**
      * The name of the <code>UTF-8</code> character encoding.
@@ -211,7 +212,11 @@ public static void launderThrowable(final Throwable t,
         final boolean isQuery = queryStr != null && queryStr.length() > 0;
         try {
             // log an error for the service.
-            log.error("cause=" + t + (isQuery ? ", query=" + queryStr : ""), t);
+            if (isQuery) {
+                log.error("cause={}, query={}", t, queryStr, t);
+            } else {
+                log.error("cause={}", t, t);
+            }
         } finally {
             // ignore any problems here.
         }
@@ -572,10 +577,7 @@ static public void sendGraph(final HttpServletRequest req,
 
 		if (writerFactory == null) {
 
-			if (log.isDebugEnabled()) {
-				log.debug("No writer for format: format=" + format
-						+ ", Accept=\"" + acceptStr + "\"");
-			}
+			log.debug("No writer for format: format={}, Accept=\"{}\"", format, acceptStr);
 
 			format = RDFFormat.RDFXML;