From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 19 Nov 2014 10:14:18 +0000 (+0100)
Subject: amend comments in upstart config file + disable "console log"
X-Git-Tag: collectd-5.5.0~141^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=61d3db869bbd58b71c1f96002203b68cf2f3dae2;p=collectd.git

amend comments in upstart config file + disable "console log"

Hopefully avoid some confusion for RHEL6 users which have an old upstart
version.
---

diff --git a/contrib/upstart.collectd.conf b/contrib/upstart.collectd.conf
index c175ee68..69032a51 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,15 +32,17 @@ 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.
+# Tell upstart to wait for collectd to SIGSTOP itself, signaling it is ready
+# to run.
 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