From: tang peng <tang.peng5@zte.com.cn>
Date: Thu, 9 Nov 2017 15:43:17 +0000 (+0000)
Subject: Merge "Fix Some Bugs"
X-Git-Tag: v1.0.0~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0cd31c398821790857c9f4862df35f684eab52fc;hp=79f4bc6b31cfc357c7268c6dfba30a6dc0f8abd9;p=holmes%2Fengine-management.git

Merge "Fix Some Bugs"
---

diff --git a/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java b/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java
index 141d89e..009de8e 100644
--- a/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java
@@ -15,6 +15,8 @@
  */
 package org.onap.holmes.engine.dmaap;
 
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
+
 import java.util.ArrayList;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
@@ -42,9 +44,19 @@ public class DMaaPAlarmPolling implements Runnable {
                 vesAlarmList = subscriber.subscribe();
                 vesAlarmList.forEach(vesAlarm -> droolsEngine.putRaisedIntoStream(vesAlarm));
             } catch (CorrelationException e) {
-                log.error("Failed to process alarms.", e);
+                log.error("Failed to process alarms. Sleep for 60 seconds to restart.", e);
+                try {
+                    Thread.sleep(60000);
+                } catch (InterruptedException e1) {
+                    log.info("Thread is still active.", e);
+                }
             } catch (Exception e) {
-                log.error("An error occurred while processing alarm.", e);
+                log.error("An error occurred while processing alarm. Sleep for 60 seconds to restart.", e);
+                try {
+                    Thread.sleep(60000);
+                } catch (InterruptedException e1) {
+                    log.info("Thread is still active.", e);
+                }
             }
         }
     }