Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
remove `Debug = True when run Flask and add logger
[doctor.git]
/
tests
/
monitor.py
diff --git
a/tests/monitor.py
b/tests/monitor.py
index
caf4c32
..
26c911d
100644
(file)
--- a/
tests/monitor.py
+++ b/
tests/monitor.py
@@
-10,6
+10,7
@@
import argparse
from datetime import datetime
import json
import argparse
from datetime import datetime
import json
+import logger as doctor_log
import os
import requests
import socket
import os
import requests
import socket
@@
-26,6
+27,8
@@
ICMP_ECHO_MESSAGE = '\x08\x00\xf7\xff\x00\x00\x00\x00'
SUPPORTED_INSPECTOR_TYPES = ['sample', 'congress']
SUPPORTED_INSPECTOR_TYPES = ['sample', 'congress']
+LOG = doctor_log.Logger('doctor_monitor').getLogger()
+
class DoctorMonitorSample(object):
interval = 0.1 # second
class DoctorMonitorSample(object):
interval = 0.1 # second
@@
-58,8
+61,8
@@
class DoctorMonitorSample(object):
(congress_endpoint, doctor_ds['id']))
def start_loop(self):
(congress_endpoint, doctor_ds['id']))
def start_loop(self):
-
print
"start ping to host %(h)s (ip=%(i)s)" % {'h': self.hostname,
- 'i': self.ip_addr}
+
LOG.debug(
"start ping to host %(h)s (ip=%(i)s)" % {'h': self.hostname,
+ 'i': self.ip_addr}
)
sock = socket.socket(socket.AF_INET, socket.SOCK_RAW,
socket.IPPROTO_ICMP)
sock.settimeout(self.timeout)
sock = socket.socket(socket.AF_INET, socket.SOCK_RAW,
socket.IPPROTO_ICMP)
sock.settimeout(self.timeout)
@@
-68,9
+71,9
@@
class DoctorMonitorSample(object):
sock.sendto(ICMP_ECHO_MESSAGE, (self.ip_addr, 0))
data = sock.recv(4096)
except socket.timeout:
sock.sendto(ICMP_ECHO_MESSAGE, (self.ip_addr, 0))
data = sock.recv(4096)
except socket.timeout:
-
print "doctor monitor detected at %s" % time.time(
)
+
LOG.info("doctor monitor detected at %s" % time.time()
)
self.report_error()
self.report_error()
- print "ping timeout, quit monitoring..."
+ LOG.info("ping timeout, quit monitoring...")
return
time.sleep(self.interval)
return
time.sleep(self.interval)