move all charts stuff from SimpleService update() to chart update()
lgz committed
Nov 5, 2017 at 15:59 UTC
2ae2e351644e1d16c46df21cd0a40dd6063d61b4
2 files changed
+6
-7
python.d/python_modules/bases/FrameworkServices/SimpleService.py
-4
@@ -216,11 +216,7 @@ class SimpleService(Thread, PythonDLimitedLogger, OldVersionCompatibility, objec
216
217
ok = chart.update(data, interval)
218
if ok:
219
- chart.penalty = 0
219
updated = True
221
- else:
222
- chart.flags.new = True
223
- chart.penalty += 1
220
221
if not updated:
222
self.debug('none of the charts has been updated')
python.d/python_modules/bases/charts.py
+6
-3
@@ -202,7 +202,7 @@ class Chart:
202
chart = CHART_CREATE.format(**self.params)
203
dimensions = ''.join([dimension.create() for dimension in self.dimensions])
204
variables = ''.join([var.set(var.value) for var in self.variables if var])
205
- self.flags.new = False
205
+
206
self.flags.create = False
207
208
safe_print(chart + dimensions + variables)
@@ -228,7 +228,12 @@ class Chart:
228
229
chart_begin = CHART_BEGIN.format(type=self.type, id=self.id, since_last=since_last)
230
safe_print(chart_begin, updated_dimensions, updated_variables, 'END\n')
231
+
232
self.flags.new = False
233
+ self.penalty = 0
234
+ else:
235
+ self.penalty += 1
236
+ self.flags.new = True
237
238
return bool(updated_dimensions)
239
@@ -240,8 +245,6 @@ class Chart:
245
def refresh(self):
246
self.penalty = 0
247
self.flags.create = True
243
- if self.flags.obsoleted:
244
- self.flags.new = True
248
self.flags.obsoleted = False
249
250