packages: asterisk/asterisk.init - check with aelparse syntax errors on ael...

[glen]

Author: glen                         Date: Thu Sep 16 15:08:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- check with aelparse syntax errors on ael-reload

---- Files affected:
packages/asterisk:
   asterisk.init (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/asterisk/asterisk.init
diff -u packages/asterisk/asterisk.init:1.17 packages/asterisk/asterisk.init:1.18
--- packages/asterisk/asterisk.init:1.17	Thu Sep 16 16:22:03 2010
+++ packages/asterisk/asterisk.init	Thu Sep 16 17:08:13 2010
@@ -111,14 +111,32 @@
 	fi
 }
 
+ael-reload() {
+	local res
+	res=$(aelparse -n -q | grep -F Error)
+	if [ "$res" ]; then
+		echo >&2 "$res"
+		RETVAL=1
+		return
+	fi
+
+	if [ ! -f /var/lock/subsys/asterisk ]; then
+		msg_not_running "Asterisk"
+		RETVAL=1
+		return
+	fi
+
+	/usr/sbin/asterisk -rx "ael reload"
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-  	start
+	start
 	;;
   stop)
-  	stop
+	stop
 	;;
   restart)
 	stop
@@ -128,13 +146,13 @@
 	condrestart 0
 	;;
   reload|force-reload)
-  	reload
+	reload
 	;;
   dialplan-reload)
 	/usr/sbin/asterisk -rx "dialplan reload"
 	;;
   ael-reload)
-	/usr/sbin/asterisk -rx "ael reload"
+	ael-reload
 	;;
   logger-reload)
 	/usr/sbin/asterisk -rx "logger reload"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.init?r1=1.17&r2=1.18&f=u