Merge "Handle redis restart in alarm-gen"

Juniper · Mar 17, 2016 · 578840b · 578840b
2 parents 8d262cc + 23a1002
commit 578840b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/opserver/alarmgen.py b/src/opserver/alarmgen.py
@@ -453,7 +453,7 @@ def handle_resource_check(self, part, current_inst, msgs):
 
     def reconnect_agg_uve(self, lredis):
         self._logger.error("Connected to Redis for Agg")
-        lredis.ping()
+        lredis.set(self._moduleid+':'+self._instance_id, True)
         for pp in self._workers.keys():
             self._workers[pp].reset_acq_time()
             self._workers[pp].kill(\
@@ -606,6 +606,10 @@ def run_uve_processing(self):
                             password=self._conf.redis_password(),
                             db=7)
                     self.reconnect_agg_uve(lredis)
+                else:
+                    if not lredis.exists(self._moduleid+':'+self._instance_id):
+                        self._logger.error('Identified redis restart')
+                        self.reconnect_agg_uve(lredis)
                 gevs = {}
                 pendingset = {}
                 for part in self._uveq.keys():