comments
paulfantom committed
Jun 23, 2016 at 11:45 UTC
7b5c04c09bca08abe516290229771829fe2a97e4
3 files changed
+18
-7
plugins.d/python.d.plugin
+4
@@ -358,6 +358,10 @@ class PythonCharts(object):
358
self._stop(job, "misbehaving. Reason: " + str(e))
359
360
def update(self):
361
+ """
362
+ Creates and supervises every job thread.
363
+ This will stay forever and ever and ever forever and ever it'll be the one...
364
+ """
365
for job in self.jobs:
366
job.start()
367
python.d/python_modules/base.py
+10
@@ -75,6 +75,11 @@ class BaseService(threading.Thread):
75
'freq': freq}
76
77
def _run_once(self):
78
+ """
79
+ Executes self.update(interval) and draws run time chart.
80
+ Return value presents exit status of update()
81
+ :return: boolean
82
+ """
83
t_start = time.time()
84
# check if it is time to execute job update() function
85
if self.timetable['next'] > t_start:
@@ -103,6 +108,11 @@ class BaseService(threading.Thread):
108
return True
109
110
def run(self):
111
+ """
112
+ Runs job in thread. Handles retries.
113
+ Exits when job failed or timed out.
114
+ :return: None
115
+ """
116
self.timetable['last'] = time.time()
117
while True:
118
try:
python.d/python_modules/msg.py
+4
-7
@@ -12,14 +12,11 @@ def log_msg(msg_type, *args):
12
Print message on stderr.
13
:param msg_type: str
14
"""
15
- sys.stderr.write(PROGRAM)
16
- sys.stderr.write(" ")
17
- sys.stderr.write(msg_type)
18
- sys.stderr.write(": ")
15
+ msg = PROGRAM + " " + str(msg_type) + ":"
16
for i in args:
20
- sys.stderr.write(" ")
21
- sys.stderr.write(str(i))
22
- sys.stderr.write("\n")
17
+ msg += " "
18
+ msg += str(i)
19
+ sys.stderr.write(msg + "\n")
20
sys.stderr.flush()
21
22