fix redis mutual exclusion

diff --git a/plugins.d/python.d.plugin b/plugins.d/python.d.plugin
index 74e19063a87a0ff13ee5e8e10393beebe73175ce..5186d8ba03ec2cf767282c7cf51118b05fdf4785 100755 (executable)
--- 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 93467386d8e22247bb26be5446ccb008bea435b6..b8fa3e9e3acf17f7f6e3a171e61c1788f7725dd6 100644 (file)
--- 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)