commit b43c3b003cb54eca857c691467f409d257eb65a8
author Shawn O. Pearce <sop@google.com> Fri Dec 09 15:48:47 2011 -0800
committer Shawn O. Pearce <sop@google.com> Fri Dec 09 16:23:49 2011 -0800
tree 6fb7313eca1846575cfa840e61368d44cfc62dc9
parent aa513338696f4a2de3ffbb2143102f2e906a484c

Connect Velocity to slf4j

Instead of routing directly to log4j, route through slf4j like the
rest of Gerrit Code Review. This way if a different logger is used,
Velocity will report its messages through the same channels.

Change-Id: Ifd6698f9792235bf9d1538d21a843c6e7ab63d1b

gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java
index 3be9dc9e..d6c001e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java
@@ -21,6 +21,10 @@
 
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.RuntimeInstance;
+import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.velocity.runtime.log.LogChute;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Properties;
 
@@ -39,7 +43,7 @@
 
     Properties p = new Properties();
     p.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
-        "org.apache.velocity.runtime.log.SimpleLog4JLogSystem" );
+        Slf4jLogChute.class.getName());
     p.setProperty("runtime.log.logsystem.log4j.category", "velocity");
 
     if (site.mail_dir.isDirectory()) {
@@ -60,4 +64,52 @@
     }
     return ri;
   }
+
+  /** Connects Velocity to sfl4j. */
+  public static class Slf4jLogChute implements LogChute {
+    private static final Logger log = LoggerFactory.getLogger("velocity");
+
+    @Override
+    public void init(RuntimeServices rs) {
+    }
+
+    @Override
+    public boolean isLevelEnabled(int level) {
+      switch (level) {
+        default:
+        case DEBUG_ID:
+          return log.isDebugEnabled();
+        case INFO_ID:
+          return log.isInfoEnabled();
+        case WARN_ID:
+          return log.isWarnEnabled();
+        case ERROR_ID:
+          return log.isErrorEnabled();
+      }
+    }
+
+    @Override
+    public void log(int level, String message) {
+      log(level, message, null);
+    }
+
+    @Override
+    public void log(int level, String msg, Throwable err) {
+      switch (level) {
+        default:
+        case DEBUG_ID:
+          log.debug(msg, err);
+          break;
+        case INFO_ID:
+          log.info(msg, err);
+          break;
+        case WARN_ID:
+          log.warn(msg, err);
+          break;
+        case ERROR_ID:
+          log.error(msg, err);
+          break;
+      }
+    }
+  }
 }