Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maybe Fixes #305 #308

Merged
merged 1 commit into from
Mar 30, 2016
Merged

Maybe Fixes #305 #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion debian/tcollector.init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down Expand Up @@ -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\
Expand Down
1 change: 1 addition & 0 deletions tcollector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down