SOURCES: mrtg.init - use separate functions for configcheck - fail...

[blues]

Author: blues                        Date: Thu Jul 26 14:51:03 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use separate functions for configcheck - fails very early

---- Files affected:
SOURCES:
   mrtg.init (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SOURCES/mrtg.init
diff -u SOURCES/mrtg.init:1.16 SOURCES/mrtg.init:1.17
--- SOURCES/mrtg.init:1.16	Thu Jul 26 15:48:53 2007
+++ SOURCES/mrtg.init	Thu Jul 26 16:50:58 2007
@@ -28,36 +28,55 @@
 	fi
 done
 
+checkconfigs() {
+	for file in ${CONFIGDIR}/*.cfg; do
+		f=`basename ${file}`
+		run_cmd "Checking MRTG configuration: ${f}" mrtg --check ${file}
+		RETVAL=$?
+		if [ $RETVAL -ne 0 ]; then
+			exit 1
+		fi
+	done
+	exit 0
+}
+
+# For obsolete multiple configs - to be droped soon:
+checkconfigs_old() {
+	for file in ${CONFIGS}; do
+		run_cmd "Checking MRTG configuration: ${file}" mrtg --check ${CONFIGDIR}/${file}
+		RETVAL=$?
+		if [ $RETVAL -ne 0 ]; then
+			exit 1
+		fi
+	done
+	exit 0
+}
+
+
 start() {
 	if [ ! -f /var/lock/subsys/mrtg ]; then
 		if [ ! "${CONFIGS}" ]; then
+			checkconfigs
 			for file in ${CONFIGDIR}/*.cfg; do
 				f=`basename ${file}`
-				run_cmd "Checking MRTG configuration: ${f}" mrtg --check ${file}
-				RETVAL=$?
-				if [ $RETVAL -eq 0 ]; then
-					msg_starting "mrtg (${f})"
-						daemon --user ${DAEMON_USER} mrtg ${file} --daemon \
-						--logging /var/log/mrtg/${f}.log \
-						--pid-file=/var/run/mrtg/${f}.pid \
-						--lock-file=/var/run/mrtg/${f}_l \
-						--confcache-file=/var/lib/mrtg/${f}.ok
-				fi
+				msg_starting "mrtg (${f})"
+				daemon --user ${DAEMON_USER} mrtg ${file} --daemon \
+					--logging /var/log/mrtg/${f}.log \
+					--pid-file=/var/run/mrtg/${f}.pid \
+					--lock-file=/var/run/mrtg/${f}_l \
+					--confcache-file=/var/lib/mrtg/${f}.ok
 			done
 		else
 			echo "WARNING: using obsolete CONFIGS definition."
 			echo "WARNIGN: look at /etc/sysconfig/mrtg for hints."
+			checkconfigs_old
 			for i in $CONFIGS; do
-				run_cmd "Checking MRTG configuration: ${i}" mrtg --check ${i}
-				RETVAL=$?
-				if [ $RETVAL -eq 0 ]; then
-					msg_starting "mrtg ($i)"
-						daemon --user ${DAEMON_USER} mrtg $CONFIGDIR/$i --daemon \
-						--logging /var/log/mrtg/$i.log \
-						--pid-file=/var/run/mrtg/$i.pid \
-						--lock-file=/var/run/mrtg/${f}_l \
-						--confcache-file=/var/lib/mrtg/${f}.ok
-				fi
+				msg_starting "mrtg ($i)"
+				daemon --user ${DAEMON_USER} mrtg $CONFIGDIR/$i --daemon \
+					--logging /var/log/mrtg/$i.log \
+					--pid-file=/var/run/mrtg/$i.pid \
+					--lock-file=/var/run/mrtg/${f}_l \
+					--confcache-file=/var/lib/mrtg/${f}.ok
 			done
 		fi
 		RETVAL=$?
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mrtg.init?r1=1.16&r2=1.17&f=u