github
/
spug
mirror of https://github.com/openspug/spug
1
0
Fork 0
Code Issues Releases Wiki Activity

F 修复故障恢复告警可能错误发出的问题

pull/103/head
vapao 2020-05-04 18:58:05 +08:00
parent 553e9eb402
commit 69381f1c61
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spug_api/apps/monitor/scheduler.py
View File

@ -54,9 +54,9 @@ class Scheduler:
elif mode == '4': elif mode == '4':
spug.notify_by_email(event, obj) spug.notify_by_email(event, obj)
def _handle_notify(self, obj, old_status, out): def _handle_notify(self, obj, is_notified, out):
if obj.latest_status == 0: if obj.latest_status == 0:
if old_status == 1: if is_notified:
self._record_alarm(obj, '2') self._record_alarm(obj, '2')
logger.info(f'{human_datetime()} recover job_id: {obj.id}') logger.info(f'{human_datetime()} recover job_id: {obj.id}')
self._do_notify('2', obj, out) self._do_notify('2', obj, out)
@ -84,18 +84,18 @@ class Scheduler:
elif event.code == EVENT_JOB_EXECUTED: elif event.code == EVENT_JOB_EXECUTED:
is_ok, out = event.retval is_ok, out = event.retval
obj = Detection.objects.filter(pk=event.job_id).first() obj = Detection.objects.filter(pk=event.job_id).first()
old_status = obj.latest_status is_notified = True if obj.latest_notify_time else False
obj.latest_status = 0 if is_ok else 1 if obj.latest_status in [0, None] and is_ok is False:
obj.latest_run_time = human_datetime(event.scheduled_run_time)
if old_status in [0, None] and is_ok is False:
obj.latest_fault_time = int(time.time()) obj.latest_fault_time = int(time.time())
if obj.latest_status == 0: if is_ok:
obj.latest_notify_time = 0 obj.latest_notify_time = 0
obj.fault_times = 0 obj.fault_times = 0
else: else:
obj.fault_times += 1 obj.fault_times += 1
obj.latest_status = 0 if is_ok else 1
obj.latest_run_time = human_datetime(event.scheduled_run_time)
obj.save() obj.save()
self._handle_notify(obj, old_status, out) self._handle_notify(obj, is_notified, out)
def _init(self): def _init(self):
self.scheduler.start() self.scheduler.start()