From f0650dd93d646df0946d4f9d5a6251d2b6523ab4 Mon Sep 17 00:00:00 2001 From: Jonathan Creasy Date: Mon, 21 Mar 2016 15:39:36 -0500 Subject: [PATCH] Maybe Fixes #305 --- debian/tcollector.init | 3 ++- tcollector.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/tcollector.init b/debian/tcollector.init index aa883715..3e3e6fb4 100644 --- a/debian/tcollector.init +++ b/debian/tcollector.init @@ -8,6 +8,7 @@ # Short-Description: Starts tcollector ### END INIT INFO +PYTHONPATH="$PYTHONPATH:/usr/lib/tcollector" PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/bin/tcollector EXTRA_TAGS="" @@ -64,7 +65,7 @@ case $1 in fi fi - $taskset start-stop-daemon --start --quiet -u $RUN_AS_USER\ + PYTHONPATH=$PYTHONPATH $taskset start-stop-daemon --start --quiet -u $RUN_AS_USER\ --pidfile "$PIDFILE" --chuid $RUN_AS_USER:$RUN_AS_GROUP\ --startas $DAEMON -- -c "$COLLECTOR_PATH" -L $TSD_HOSTS\ -t host=$HOSTNAME --dedup-interval $DEDUP_INTERVAL\ diff --git a/tcollector.py b/tcollector.py index 4501a4b5..9cfb53a7 100755 --- a/tcollector.py +++ b/tcollector.py @@ -815,6 +815,7 @@ def parse_cmdline(argv): defaults = config.get_defaults() except ImportError: sys.stderr.write("ImportError: Could not load defaults from configuration. Using hardcoded values") + default_cdir = os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), 'collectors') defaults = { 'verbose': False, 'no_tcollector_stats': False,