From: paulfantom <paulfantom@gmail.com>
Date: Thu, 14 Jul 2016 23:43:11 +0000 (+0200)
Subject: fix redis mutual exclusion
X-Git-Tag: v1.3.0~66^2~1
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27821d986755e44de568dc333aa1139168a14232;p=netdata.git

fix redis mutual exclusion
---

diff --git a/plugins.d/python.d.plugin b/plugins.d/python.d.plugin
index 74e19063..5186d8ba 100755
--- a/plugins.d/python.d.plugin
+++ b/plugins.d/python.d.plugin
@@ -289,7 +289,7 @@ class PythonCharts(object):
             self.jobs.remove(job)
             msg.info("Disabled", prefix)
         except Exception as e:
-            msg.debug("This shouldn't happen. NO " + prefix + " IN LIST:" + str(self.jobs))
+            msg.debug("This shouldn't happen. NO " + prefix + " IN LIST:" + str(self.jobs) + " ERROR: " + str(e))
 
         prefix += ": "
         if reason is None:
diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py
index 93467386..b8fa3e9e 100644
--- a/python.d/python_modules/base.py
+++ b/python.d/python_modules/base.py
@@ -540,7 +540,7 @@ class SocketService(SimpleService):
         Parse configuration data
         :return: boolean
         """
-        if self.name is not None or self.name != str(None):
+        if self.name is None or self.name == str(None):
             self.name = ""
         else:
             self.name = str(self.name)