packages (upstart_native): syslog-ng/syslog-ng.init, syslog-ng/syslog-ng.up...

[jajcus]

Author: jajcus                       Date: Mon May 10 07:11:35 2010 GMT
Module: packages                      Tag: upstart_native
---- Log message:
- use process mode 'background' instead of the default 'safe-background'. Only
  this way upstart can properly supervise the syslog-ng process and flush-logs
  can load (otherwise syslog-ng starts with its own supervisor process and
  wrong process gets the SIGHUP).
- flush-logs implemented for upstart

---- Files affected:
packages/syslog-ng:
   syslog-ng.init (1.28.2.2 -> 1.28.2.3) , syslog-ng.upstart (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng.init
diff -u packages/syslog-ng/syslog-ng.init:1.28.2.2 packages/syslog-ng/syslog-ng.init:1.28.2.3
--- packages/syslog-ng/syslog-ng.init:1.28.2.2	Fri May  7 14:33:28 2010
+++ packages/syslog-ng/syslog-ng.init	Mon May 10 09:11:30 2010
@@ -88,7 +88,9 @@
 }
 
 flush_logs() {
-	if [ -f /var/lock/subsys/syslog-ng ]; then
+	if use_upstart && [ -f /etc/init/syslog-ng.conf ] ; then
+		/sbin/initctl reload syslog-ng
+	elif [ -f /var/lock/subsys/syslog-ng ]; then
 		configtest
 		msg_reloading "syslog-ng"
 		killproc syslog-ng -HUP
@@ -99,7 +101,7 @@
 	fi
 }
 
-upstart_controlled --except configtest
+upstart_controlled --except configtest flush-logs
 
 RETVAL=0
 # See how we were called.

================================================================
Index: packages/syslog-ng/syslog-ng.upstart
diff -u packages/syslog-ng/syslog-ng.upstart:1.1.2.2 packages/syslog-ng/syslog-ng.upstart:1.1.2.3
--- packages/syslog-ng/syslog-ng.upstart:1.1.2.2	Fri May  7 17:48:58 2010
+++ packages/syslog-ng/syslog-ng.upstart	Mon May 10 09:11:30 2010
@@ -9,7 +9,7 @@
 
 console output
 
-exec /usr/sbin/syslog-ng -f /etc/syslog-ng/syslog-ng.conf
+exec /usr/sbin/syslog-ng --process-mode=background -f /etc/syslog-ng/syslog-ng.conf
 expect fork
 
 # vi: ft=upstart
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.init?r1=1.28.2.2&r2=1.28.2.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.upstart?r1=1.1.2.2&r2=1.1.2.3&f=u