From 6f270be131287cbc401daa5c67598b7bed71acd6 Mon Sep 17 00:00:00 2001 From: Anish Mehta Date: Tue, 13 Dec 2016 22:29:46 -0800 Subject: [PATCH] Exiting alarmgen with errorcode, so it will automatically restart. Closes-Bug:1648338 Change-Id: I1d7bf76271bc53625a396d214684f87e1062ca5e --- src/opserver/alarmgen.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/opserver/alarmgen.py b/src/opserver/alarmgen.py index 62e46f3e614..43e8d8c6d86 100644 --- a/src/opserver/alarmgen.py +++ b/src/opserver/alarmgen.py @@ -535,7 +535,7 @@ def update_tab_alarms_timer(tab, uv, nm, curr_index, timeout_val, [timeout_val]: self._logger.error("Timer error for (%s,%s,%s)" % \ (tab, uv, nm)) - raise SystemExit + raise SystemExit(1) AlarmStateMachine.tab_alarms_timer[timeout_val].add\ ((asm.tab, asm.uv, asm.nm)) @@ -703,7 +703,7 @@ def libpart_cb(self, part_list): self._logger.error('Partition Del : %s' % str(oldset-newset)) if not self.partition_change(oldset-newset, False): self._logger.error('Partition Del : %s failed!' % str(oldset-newset)) - raise SystemExit + raise SystemExit(1) self._logger.error('Partition Del done: %s' % str(oldset-newset)) @@ -715,7 +715,7 @@ def libpart_cb(self, part_list): self._logger.error('Partition List failed %s %s' % \ (str(newset),str(oldset))) except SystemExit: - raise SystemExit + raise SystemExit(1) self._logger.error('Partition List done : new %s old %s' % \ (str(newset),str(oldset))) @@ -866,7 +866,7 @@ def send_agg_uve(self, redish, inst, part, acq_time, rows): """ if not redish: self._logger.error("No redis handle") - raise SystemExit + raise SystemExit(1) old_acq_time = redish.hget("AGPARTS:%s" % inst, part) if old_acq_time is None: self._logger.error("Agg %s part %d new" % (inst, part)) @@ -931,7 +931,7 @@ def send_agg_uve(self, redish, inst, part, acq_time, rows): if retry: self._logger.error("Agg unexpected rows %s" % str(rows)) - raise SystemExit + raise SystemExit(1) def send_alarm_update(self, tab, uk): ustruct = None @@ -1126,7 +1126,7 @@ def run_uve_processing(self): messag = template.format(type(ex).__name__, ex.args) self._logger.error("%s : traceback %s" % \ (messag, traceback.format_exc())) - raise SystemExit + raise SystemExit(1) if (curr - prev) < 1: gevent.sleep(1 - (curr - prev)) self._logger.info("UVE Done")