projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3329 from efuss/fix-3311
[collectd.git]
/
contrib
/
upstart.collectd.conf
diff --git
a/contrib/upstart.collectd.conf
b/contrib/upstart.collectd.conf
index
69032a5
..
f833edf
100644
(file)
--- a/
contrib/upstart.collectd.conf
+++ b/
contrib/upstart.collectd.conf
@@
-33,7
+33,8
@@
stop on runlevel [!2345]
env DAEMON=/usr/sbin/collectd
# Tell upstart to wait for collectd to SIGSTOP itself, signaling it is ready
env DAEMON=/usr/sbin/collectd
# Tell upstart to wait for collectd to SIGSTOP itself, signaling it is ready
-# to run.
+# 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
expect stop
# prevent thrashing - 10 restarts in 5 seconds
@@
-46,5
+47,5
@@
respawn limit 10 5
# 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