[patch] syslog-ng.rc.1.13.patch

syslog-ng.rc.1.13.patch (text/plain), 1.28 KB, created by Eldad Zack (RETIRED) on 2004-07-24 12:14:54 UTC

--- /usr/portage/app-admin/syslog-ng/files/syslog-ng.rc6	2004-07-15 08:05:52.000000000 +0300
+++ syslog-ng	2004-07-24 22:07:14.020210352 +0300
@@ -4,10 +4,11 @@
 # $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.rc6,v 1.13 2004/07/14 21:20:06 agriffis Exp $
 
 opts="depend checkconfig start stop reload"
+SYSLOGNG_CONF=/etc/syslog-ng/syslog-ng.conf
 
 depend() {
 	# make networking dependency conditional on configuration
-	sed 's/#.*//' /etc/syslog-ng/syslog-ng.conf | \
+	sed 's/#.*//' ${SYSLOGNG_CONF} | \
 	grep -Eq '(source|destination).*(tcp|udp)' && need net
 
 	need clock hostname
@@ -15,11 +16,13 @@
 }
 
 checkconfig() {
-	if [ ! -e /etc/syslog-ng/syslog-ng.conf ] ; then
-		eerror "You need to create /etc/syslog-ng/syslog-ng.conf first."
+	if [ ! -e ${SYSLOGNG_CONF} ] ; then
+		eerror "You need to create ${SYSLOGNG_CONF} first."
 		eerror "An example can be found in /etc/syslog-ng/syslog-ng.conf.sample"
 		return 1
 	fi
+	syslog-ng -s ${SYSLOGNG_CONF}
+	eend $? "Configuration error. Please fix your configfile (${SYSLOGNG_CONF})"
 }
 
 start() {
@@ -41,6 +44,7 @@
 		eerror "syslog-ng isn't running"
 		return 1
 	fi
+	checkconfig || return 1
 	ebegin "Reloading configuration and re-opening log files"
 	kill -HUP `cat /var/run/syslog-ng.pid` &>/dev/null
 	eend $?