From: paulfantom <paulfantom@gmail.com>
Date: Mon, 20 Jun 2016 11:35:32 +0000 (+0200)
Subject: updated configuration file
X-Git-Tag: v1.3.0~116^2~3
X-Git-Url: https://arthur.barton.de/gitweb/?p=netdata.git;a=commitdiff_plain;h=62eca58edf7512fc7c397c2f27a60f4db0f69871

updated configuration file
---

diff --git a/conf.d/python.d.conf b/conf.d/python.d.conf
index c70f8599..b4672211 100644
--- a/conf.d/python.d.conf
+++ b/conf.d/python.d.conf
@@ -1,11 +1,5 @@
 # This is the configuration for python.d.plugin
 
-# It sets custom configuration directory for python modules
-# plugins_config_dir=
-
-# This is a directory with python modules
-# plugins_dir=
-
 # By default python.d.plugin enables all modules stored in python.d
 # Modules can be disabled with setting "module_name = no"
 example: no
diff --git a/plugins.d/python.d.plugin b/plugins.d/python.d.plugin
index 5a076678..a714dbda 100755
--- a/plugins.d/python.d.plugin
+++ b/plugins.d/python.d.plugin
@@ -527,8 +527,6 @@ def run():
                 continue
             if v is False:
                 disabled.append(k)
-    else:
-        modules_conf = CONFIG_DIR + "python.d/"
 
     # parse passed command line arguments
     out = parse_cmdline(MODULES_DIR, *sys.argv)
@@ -537,7 +535,7 @@ def run():
         interval = out['interval']
 
     # run plugins
-    charts = PythonCharts(interval, modules, MODULES_DIR, modules_conf, disabled)
+    charts = PythonCharts(interval, modules, MODULES_DIR, CONFIG_DIR + "python.d/", disabled)
     charts.check()
     charts.create()
     charts.update()