Charts flags rename and fixes
lgz committed
Nov 5, 2017 at 16:25 UTC
76882d838ad6c9d41743c453667f6e7b4ebc20a3
2 files changed
+12
-10
python.d/python_modules/bases/FrameworkServices/SimpleService.py
+1
-1
@@ -211,7 +211,7 @@ class SimpleService(Thread, PythonDLimitedLogger, OldVersionCompatibility, objec
211
continue
212
elif self.charts.cleanup and chart.penalty >= self.charts.cleanup:
213
chart.obsolete()
214
- self.error("chart '{0}' was removed due to non updating".format(chart.name))
214
+ self.error("chart '{0}' was suppressed due to non updating".format(chart.name))
215
continue
216
217
ok = chart.update(data, interval)
python.d/python_modules/bases/charts.py
+11
-9
@@ -203,7 +203,8 @@ class Chart:
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
206
- self.flags.create = False
206
+ self.flags.push = False
207
+ self.flags.created = True
208
209
safe_print(chart + dimensions + variables)
210
@@ -221,30 +222,30 @@ class Chart:
222
updated_variables += var.set(value)
223
224
if updated_dimensions:
224
- since_last = 0 if self.flags.new else interval
225
+ since_last = interval if self.flags.updated else 0
226
226
- if self.flags.create:
227
+ if self.flags.push:
228
self.create()
229
230
chart_begin = CHART_BEGIN.format(type=self.type, id=self.id, since_last=since_last)
231
safe_print(chart_begin, updated_dimensions, updated_variables, 'END\n')
232
232
- self.flags.new = False
233
+ self.flags.updated = True
234
self.penalty = 0
235
else:
236
self.penalty += 1
236
- self.flags.new = True
237
+ self.flags.updated = False
238
239
return bool(updated_dimensions)
240
241
def obsolete(self):
242
self.flags.obsoleted = True
242
- if not self.flags.new:
243
+ if self.flags.created:
244
safe_print(CHART_OBSOLETE.format(**self.params))
245
246
def refresh(self):
247
self.penalty = 0
247
- self.flags.create = True
248
+ self.flags.push = True
249
self.flags.obsoleted = False
250
251
@@ -355,6 +356,7 @@ class ChartVariable:
356
357
class ChartFlags:
358
def __init__(self):
358
- self.new = True
359
- self.create = True
359
+ self.push = True
360
+ self.created = False
361
+ self.updated = False
362
self.obsoleted = False