"since_last" interval bugfix
lgz committed
Oct 22, 2017 at 05:51 UTC
c4eecd0de7ff7ce18453f86a944f0d13295b13d2
1 file changed
+7
-7
python.d/python_modules/bases/FrameworkServices/SimpleService.py
+7
-7
@@ -172,11 +172,8 @@ class SimpleService(Thread, PythonDLimitedLogger, OldVersionCompatibility, objec
172
173
self.sleep_until_next_run()
174
175
- if job.PREV_UPDATE:
176
- job.SINCE_UPDATE = int((job.START_RUN - job.PREV_UPDATE) * 1e6)
177
-
175
try:
179
- updated = self.update(interval=job.SINCE_UPDATE)
176
+ updated = self.update()
177
except Exception as error:
178
self.debug('update() unhandled exception: {error}'.format(error=error))
179
updated = False
@@ -197,9 +194,8 @@ class SimpleService(Thread, PythonDLimitedLogger, OldVersionCompatibility, objec
194
elapsed=job.ELAPSED if updated else '-',
195
retries=job.RETRIES_MAX - job.RETRIES))
196
200
- def update(self, interval):
197
+ def update(self):
198
"""
202
- :param interval: <int>
199
:return:
200
"""
201
data = self.get_data()
@@ -210,6 +206,10 @@ class SimpleService(Thread, PythonDLimitedLogger, OldVersionCompatibility, objec
206
self.debug('get_data() returns incorrect type data')
207
return False
208
209
+ job = self._runtime_counters
210
+ if job.PREV_UPDATE:
211
+ job.SINCE_UPDATE = int((time() - job.PREV_UPDATE) * 1e6)
212
+
213
charts_updated = False
214
215
for chart in self.charts.penalty_exceeded(penalty_max=CHART_OBSOLETE_PENALTY):
@@ -240,7 +240,7 @@ class SimpleService(Thread, PythonDLimitedLogger, OldVersionCompatibility, objec
240
241
if dimension_updated:
242
charts_updated = True
243
- safe_print(''.join([chart.begin(since_last=interval),
243
+ safe_print(''.join([chart.begin(since_last=job.SINCE_UPDATE),
244
dimension_updated,
245
variables_updated,
246
'END\n']))