Migrate to Flogger
Change-Id: I2461be9eb9a2dbded62759ee5e32effa181dd047
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServlet.java
index f05e33d..c04d6ac 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServlet.java
@@ -14,6 +14,7 @@
package com.ericsson.gerrit.plugins.eventslog;
+import com.google.common.flogger.FluentLogger;
import com.google.gerrit.extensions.restapi.Url;
import com.google.gerrit.server.CurrentUser;
import com.google.inject.Inject;
@@ -27,12 +28,10 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@Singleton
class EventsRestApiServlet extends HttpServlet {
- private static final Logger log = LoggerFactory.getLogger(EventsRestApiServlet.class);
+ private static final FluentLogger log = FluentLogger.forEnclosingClass();
private static final long serialVersionUID = 1L;
private final EventStore store;
@@ -63,13 +62,13 @@
out.write(event + "\n");
}
} catch (MalformedQueryException e) {
- log.error("Bad Request", e);
+ log.atSevere().withCause(e).log("Bad Request");
rsp.sendError(HttpServletResponse.SC_BAD_REQUEST);
} catch (ServiceUnavailableException e) {
- log.error("Service Unavailable", e);
+ log.atSevere().withCause(e).log("Service Unavailable");
rsp.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
} catch (EventsLogException e) {
- log.error("Could not query from request parameters", e);
+ log.atSevere().withCause(e).log("Could not query from request parameters");
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLClient.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLClient.java
index 9e538e6..b554ecd 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLClient.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLClient.java
@@ -29,6 +29,7 @@
import com.google.common.base.Supplier;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
+import com.google.common.flogger.FluentLogger;
import com.google.gerrit.server.events.ProjectEvent;
import com.google.gerrit.server.events.SupplierSerializer;
import com.google.gson.Gson;
@@ -42,11 +43,9 @@
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
class SQLClient {
- private static final Logger log = LoggerFactory.getLogger(SQLClient.class);
+ private static final FluentLogger log = FluentLogger.forEnclosingClass();
private final Gson gson;
private final SQLDialect databaseDialect;
@@ -144,9 +143,11 @@
TABLE_NAME,
DATE_ENTRY,
new Timestamp(System.currentTimeMillis() - MILLISECONDS.convert(maxAge, DAYS))));
- log.info("Events older than {} days were removed from database {}", maxAge, ds.getPoolName());
+ log.atInfo().log(
+ "Events older than %d days were removed from database %s", maxAge, ds.getPoolName());
} catch (SQLException e) {
- log.warn("Cannot remove old event entries from database {}", ds.getPoolName(), e);
+ log.atWarning().withCause(e).log(
+ "Cannot remove old event entries from database %s", ds.getPoolName());
}
}
@@ -159,7 +160,7 @@
try {
execute(format("DELETE FROM %s WHERE project = '%s'", TABLE_NAME, project));
} catch (SQLException e) {
- log.warn("Cannot remove project {} events from database", project, e);
+ log.atWarning().withCause(e).log("Cannot remove project %s events from database", project);
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
index 2119306..6289c2d 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
@@ -22,6 +22,7 @@
import com.ericsson.gerrit.plugins.eventslog.EventsLogConfig;
import com.ericsson.gerrit.plugins.eventslog.EventsLogException;
import com.ericsson.gerrit.plugins.eventslog.ServiceUnavailableException;
+import com.google.common.flogger.FluentLogger;
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.reviewdb.client.Project;
@@ -44,12 +45,10 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@Singleton
class SQLStore implements EventStore, LifecycleListener {
- private static final Logger log = LoggerFactory.getLogger(SQLStore.class);
+ private static final FluentLogger log = FluentLogger.forEnclosingClass();
private static final String H2_DB_SUFFIX = ".h2.db";
private final EventsLogCleaner eventsLogCleaner;
@@ -123,7 +122,7 @@
} catch (AuthException e) {
// Ignore
} catch (PermissionBackendException e) {
- log.warn("Cannot check project access permission", e);
+ log.atWarning().withCause(e).log("Cannot check project access permission");
}
}
return entries.stream().sorted().map(SQLEntry::getEvent).collect(toList());
@@ -147,14 +146,14 @@
try {
getEventsDb().storeEvent(event);
} catch (SQLException e) {
- log.warn("Cannot store ChangeEvent for: {}", projectName.get(), e);
+ log.atWarning().withCause(e).log("Cannot store ChangeEvent for: %s}", projectName.get());
if (e.getCause() instanceof ConnectException
|| e.getMessage().contains("terminating connection")) {
done = false;
try {
retryIfAllowed(failedConnections);
} catch (InterruptedException e1) {
- log.warn("Cannot store ChangeEvent for {}: Interrupted", projectName.get());
+ log.atWarning().log("Cannot store ChangeEvent for %s: Interrupted", projectName.get());
Thread.currentThread().interrupt();
return;
}
@@ -166,10 +165,10 @@
private void retryIfAllowed(int failedConnections) throws InterruptedException {
if (failedConnections < maxTries - 1) {
- log.info("Retrying store event");
+ log.atInfo().log("Retrying store event");
Thread.sleep(waitTime);
} else {
- log.error("Failed to store event {} times", maxTries);
+ log.atSevere().log("Failed to store event %d times", maxTries);
setOnline(false);
}
}
@@ -178,10 +177,9 @@
try {
getEventsDb().createDBIfNotCreated();
} catch (SQLException e) {
- log.warn(
+ log.atWarning().withCause(e).log(
"Cannot start the database. Events will be stored locally"
- + " until database connection can be established",
- e);
+ + " until database connection can be established");
setOnline(false);
}
if (online) {
@@ -218,14 +216,14 @@
try {
List<SQLEntry> entries = localEventsDb.getAll();
if (entries.isEmpty()) {
- log.debug("No events to restore from local");
+ log.atFine().log("No events to restore from local");
return;
}
for (SQLEntry entry : entries) {
restoreEvent(entry);
}
} catch (SQLException e) {
- log.warn("Could not query all events from local", e);
+ log.atWarning().withCause(e).log("Could not query all events from local");
}
copyFile(copyLocal);
localEventsDb.removeOldEvents(0);
@@ -235,7 +233,7 @@
try {
eventsDb.storeEvent(entry.getName(), entry.getTimestamp(), entry.getEvent());
} catch (SQLException e) {
- log.warn("Could not restore events from local", e);
+ log.atWarning().withCause(e).log("Could not restore events from local");
}
}
@@ -246,7 +244,7 @@
public void run() {
if (checkConnection()) {
setOnline(true);
- log.info("Connected to database");
+ log.atInfo().log("Connected to database");
}
}
@@ -256,12 +254,12 @@
}
private boolean checkConnection() {
- log.debug("Checking database connection...");
+ log.atFine().log("Checking database connection...");
try {
eventsDb.queryOne();
return true;
} catch (SQLException e) {
- log.error("Problem checking database connection", e);
+ log.atSevere().withCause(e).log("Problem checking database connection");
return false;
}
}
@@ -272,7 +270,8 @@
try {
exists = localEventsDb.dbExists();
} catch (SQLException e) {
- log.warn("Could not check existence of local database, assume that it doesn't exist", e);
+ log.atWarning().withCause(e).log(
+ "Could not check existence of local database, assume that it doesn't exist");
}
return exists;
}
@@ -288,7 +287,7 @@
try {
Files.copy(file, copyFile);
} catch (IOException e) {
- log.warn("Could not copy local database file with timestamp", e);
+ log.atWarning().withCause(e).log("Could not copy local database file with timestamp");
}
}
}
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
index b473ad9..68b9801 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
@@ -28,6 +28,7 @@
import com.ericsson.gerrit.plugins.eventslog.MalformedQueryException;
import com.ericsson.gerrit.plugins.eventslog.ServiceUnavailableException;
import com.google.common.collect.ImmutableList;
+import com.google.common.flogger.FluentLogger;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.events.ProjectEvent;
import com.google.gerrit.server.permissions.PermissionBackend;
@@ -55,12 +56,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@RunWith(MockitoJUnitRunner.class)
public class SQLStoreTest {
- private static final Logger log = LoggerFactory.getLogger(SQLStoreTest.class);
+ private static final FluentLogger log = FluentLogger.forEnclosingClass();
private static final String TEST_URL = "jdbc:h2:mem:" + TABLE_NAME;
private static final String TEST_LOCAL_URL = "jdbc:h2:mem:test";
private static final String TEST_OPTIONS = "DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false";
@@ -413,7 +412,7 @@
@Override
public ScheduledFuture<?> scheduleWithFixedDelay(
Runnable command, long initialDelay, long delay, TimeUnit unit) {
- log.info(command.toString());
+ log.atInfo().log(command.toString());
command.run();
return null;
}
