From 803bdbe2877d24a2672bd151002cba5623ac2fbd Mon Sep 17 00:00:00 2001 From: srubio Date: Tue, 20 Feb 2018 16:03:04 +0100 Subject: [PATCH] Improve Status Message --- panic/ds/PyAlarm.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/panic/ds/PyAlarm.py b/panic/ds/PyAlarm.py index 06feb965..ed9fdadb 100755 --- a/panic/ds/PyAlarm.py +++ b/panic/ds/PyAlarm.py @@ -1447,7 +1447,9 @@ def always_executed_hook(self): if self.get_enabled(): self.set_state(PyTango.DevState.ALARM if actives else PyTango.DevState.ON) - status = "There are %d active alarms\n" % len(actives) + status = "There are %d/%d active alarms\n" % ( + len(actives),len(self.Alarms)) + else: self.set_state(PyTango.DevState.DISABLE) status = ("Device is DISABLED temporarily (Enabled=%s)\n" @@ -1467,8 +1469,11 @@ def always_executed_hook(self): if self.Uncatched: status+='\nUncatched exceptions:\n%s'%self.Uncatched - self.eval_status = 'EvalTimes are: \n %s\n'%(self.EvalTimes) - self.set_status(status) + self.eval_status = "Last eval was %s at %s" % ( + self.Eval.getter('TAG'), + time2str(self.Eval.getter('now'))) + #self.eval_status += 'EvalTimes are: \n %s\n'%(self.EvalTimes) + self.set_status(status+self.eval_status) except: self.warning( traceback.format_exc())