From 631c3f99f0e499edd1adcbc7550dd3d0de393e31 Mon Sep 17 00:00:00 2001 From: dongwenjuan Date: Tue, 20 Mar 2018 15:13:14 +0800 Subject: optimize the fault notification test Change-Id: I47572b4515049c49f9aa04bf7984757779a605f3 Signed-off-by: dongwenjuan --- doctor_tests/monitor/base.py | 9 +++++++++ doctor_tests/monitor/sample.py | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'doctor_tests/monitor') diff --git a/doctor_tests/monitor/base.py b/doctor_tests/monitor/base.py index 119c8a1c..c2341225 100644 --- a/doctor_tests/monitor/base.py +++ b/doctor_tests/monitor/base.py @@ -17,6 +17,15 @@ class BaseMonitor(object): self.conf = conf self.log = log self.inspector_url = inspector_url + self._detected_time = None + + @property + def detected_time(self): + return self._detected_time + + @detected_time.setter + def detected_time(self, detected_time): + self._detected_time = detected_time @abc.abstractmethod def start(self, host): diff --git a/doctor_tests/monitor/sample.py b/doctor_tests/monitor/sample.py index c207cd9f..9b21750b 100644 --- a/doctor_tests/monitor/sample.py +++ b/doctor_tests/monitor/sample.py @@ -94,7 +94,9 @@ class Pinger(Thread): sock.sendto(self.ICMP_ECHO_MESSAGE, (self.ip_addr, 0)) sock.recv(4096) except socket.timeout: - self.log.info("doctor monitor detected at %s" % time.time()) + detected_time = time.time() + self.log.info("doctor monitor detected at %s" % detected_time) + self.monitor.detected_time = detected_time self.monitor.report_error(self.hostname) self.log.info("ping timeout, quit monitoring...") self._stopped = True -- cgit 1.2.3-korg