projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.4'
[collectd.git]
/
contrib
/
upstart.collectd.conf
diff --git
a/contrib/upstart.collectd.conf
b/contrib/upstart.collectd.conf
index
1c7fd9c
..
f833edf
100644
(file)
--- a/
contrib/upstart.collectd.conf
+++ b/
contrib/upstart.collectd.conf
@@
-20,6
+20,7
@@
stop on runlevel [!2345]
# these cannot be started at boot time by the system without
# arcane trickery. Also a root user will not see these tasks/jobs
# by default. set*id is a reasonable and secure compromise.
# these cannot be started at boot time by the system without
# arcane trickery. Also a root user will not see these tasks/jobs
# by default. set*id is a reasonable and secure compromise.
+# These options are not supported on early upstart versions.
#setuid nobody
#setgid nobody
#setuid nobody
#setgid nobody
@@
-31,17
+32,20
@@
stop on runlevel [!2345]
# shell commands via `sh -e`.
env DAEMON=/usr/sbin/collectd
# shell commands via `sh -e`.
env DAEMON=/usr/sbin/collectd
-# Tell upstart to watch for forking when tracking the pid for us.
-expect fork
+# Tell upstart to wait for collectd to SIGSTOP itself, signaling it is ready
+# to run. Warning: this only works with collectd 5.5 and newer. You'll have to
+# use "expect fork" instead, if using collectd 5.4 and older.
+expect stop
# prevent thrashing - 10 restarts in 5 seconds
respawn
respawn limit 10 5
# prevent thrashing - 10 restarts in 5 seconds
respawn
respawn limit 10 5
-# Make a log available in /var/log/upstart/collectd.log
-console log
+# Uncomment to make a log available in /var/log/upstart/collectd.log
+# (not supported on early upstart versions).
+#console log
# The daemon will not start if the configuration is invalid.
pre-start exec $DAEMON -t
# The daemon will not start if the configuration is invalid.
pre-start exec $DAEMON -t
-# Let's
Fork
!
+# Let's
start
!
exec $DAEMON
exec $DAEMON