#302 Improve replication service

dvoraka · Jan 6, 2018 · e57b896 · e57b896
1 parent 82abcd7
commit e57b896
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/storage/src/main/java/dvoraka/avservice/storage/replication/DefaultReplicationService.java b/storage/src/main/java/dvoraka/avservice/storage/replication/DefaultReplicationService.java
@@ -109,14 +109,22 @@ public void stop() {
 
     private void scheduleDiscovery() {
         executorService.scheduleWithFixedDelay(
-                this::discoverNeighbours, 0, DISCOVER_DELAY, TimeUnit.MILLISECONDS);
+                this::discoverNeighboursSafe, 0, DISCOVER_DELAY, TimeUnit.MILLISECONDS);
     }
 
     private void waitForOthers() {
         waitUntil(responseClient::isRunning);
         waitUntil(remoteLock::isRunning);
     }
 
+    private void discoverNeighboursSafe() {
+        try {
+            discoverNeighbours();
+        } catch (Exception e) {
+            log.warn("Discovery failed!", e);
+        }
+    }
+
     private void discoverNeighbours() {
         log.debug("Discovering neighbours {}...", idString);
 
@@ -139,6 +147,7 @@ private void discoverNeighbours() {
             log.debug("Discovered {}: {}", idString, neighbourCount());
         }
 
+        //TODO: if it's stopped it sets running flag again
         if (!isRunning()) {
             setRunning(true);
         }