X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=contrib%2Fupstart.collectd.conf;h=f833edf63fe8343f77c043eb2c09b6b3d69e3ecf;hp=1c7fd9c732956ab166a2bcda51c7e772dd374b96;hb=master;hpb=b61a03b05c1f4040a6599334b65141aa3bd134f5

diff --git a/contrib/upstart.collectd.conf b/contrib/upstart.collectd.conf
index 1c7fd9c7..f833edf6 100644
--- 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 options are not supported on early upstart versions.
 #setuid nobody
 #setgid nobody
 
@@ -31,17 +32,20 @@ stop on runlevel [!2345]
 # 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
 
-# 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
-# Let's Fork!
+# Let's start!
 exec $DAEMON