Merge branch 'stable-2.16'
* stable-2.16:
Update bazlets to latest revision on stable-2.16
Update bazlets to latest revision on stable-2.15
Update bazlets to latest revision on stable-2.14
Migrate to Flogger
Change-Id: Ic6ccefc79523e6cd07564958b13e884d0bf99363
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java
index 9402bf4..d91f831 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java
@@ -14,6 +14,7 @@
package com.googlesource.gerrit.plugins.gitiles;
+import com.google.common.flogger.FluentLogger;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.config.SitePaths;
import com.google.gitiles.GitilesAccess;
@@ -43,8 +44,6 @@
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.transport.resolver.RepositoryResolver;
import org.eclipse.jgit.util.FS;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
class HttpModule extends ServletModule {
private final Provider<CurrentUser> userProvider;
@@ -86,7 +85,7 @@
};
}
- private static final Logger log = LoggerFactory.getLogger(HttpModule.class);
+ private static final FluentLogger log = FluentLogger.forEnclosingClass();
@Override
protected void configureServlets() {
@@ -127,7 +126,7 @@
if (cfg.getFile().exists()) {
cfg.load();
} else {
- log.info("No " + cfgFile.getAbsolutePath() + "; assuming defaults");
+ log.atInfo().log("No %s; assuming defaults", cfgFile.getAbsolutePath());
}
return cfg;
}
