From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 5 Dec 2014 13:01:05 +0000 (+0100)
Subject: upstart example config: clarify expect stanza ambiguity
X-Git-Tag: collectd-5.5.0~110
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c7b46a438fecf99ae632e686b11f2aaa617b1770;p=collectd.git

upstart example config: clarify expect stanza ambiguity
---

diff --git a/contrib/upstart.collectd.conf b/contrib/upstart.collectd.conf
index 69032a51..f833edf6 100644
--- 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
-# 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
@@ -46,5 +47,5 @@ respawn limit 10 5
 
 # The daemon will not start if the configuration is invalid.
 pre-start exec $DAEMON -t
-# Let's Fork!
+# Let's start!
 exec $DAEMON