commit 3e67122a819be0232166dff74587db43fbd2981f
author Marco Miller <marco.miller@ericsson.com> Thu Apr 04 14:35:08 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Thu Apr 04 14:38:16 2019 -0400
tree d2e8ee7d2b6cf15c7a22f5555ecff23f9fd39b39
parent 7b474529731572cfed5d5f42d12ce58c72d930fd
parent 3f6ae68396f3329b76f0489d3740c47f5dfb2acb

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  HeartbeatDaemon: Use Logger's built-in String formatting

Change-Id: I7053f7df5889e3a9e9b19e6b5042ccee14017b86

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 5e0ac2a..1c29a45 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "8d7664e169100e537340aed89345c3245cf12f22",
+    commit = "8386b3fbf80e375f0a10c8386c0a8dfe260c5c1b",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java b/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java
index 63c2f84..7752993 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatDaemon.java
@@ -17,6 +17,7 @@
 import com.google.gerrit.common.EventDispatcher;
 import com.google.gerrit.extensions.events.LifecycleListener;
 import com.google.gerrit.extensions.registration.DynamicItem;
+import com.google.gerrit.server.permissions.PermissionBackendException;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -65,7 +66,7 @@
     public void run() {
       try {
         dispatcher.get().postEvent(new HeartbeatEvent());
-      } catch (OrmException e) {
+      } catch (OrmException | PermissionBackendException e) {
         logger.error("Failed to post heartbeat event: {}", e.getMessage(), e);
       }
     }