fix redis mutual exclusion
paulfantom committed
Jul 15, 2016 at 01:43 UTC
27821d986755e44de568dc333aa1139168a14232
2 files changed
+2
-2
plugins.d/python.d.plugin
+1
-1
@@ -289,7 +289,7 @@ class PythonCharts(object):
289
self.jobs.remove(job)
290
msg.info("Disabled", prefix)
291
except Exception as e:
292
- msg.debug("This shouldn't happen. NO " + prefix + " IN LIST:" + str(self.jobs))
292
+ msg.debug("This shouldn't happen. NO " + prefix + " IN LIST:" + str(self.jobs) + " ERROR: " + str(e))
293
294
prefix += ": "
295
if reason is None:
python.d/python_modules/base.py
+1
-1
@@ -540,7 +540,7 @@ class SocketService(SimpleService):
540
Parse configuration data
541
:return: boolean
542
"""
543
- if self.name is not None or self.name != str(None):
543
+ if self.name is None or self.name == str(None):
544
self.name = ""
545
else:
546
self.name = str(self.name)