SOURCES: callweaver.init, callweaver.sysconfig - update

[arekm]

Author: arekm                        Date: Thu Apr 26 07:47:34 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update

---- Files affected:
SOURCES:
   callweaver.init (1.4 -> 1.5) , callweaver.sysconfig (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/callweaver.init
diff -u SOURCES/callweaver.init:1.4 SOURCES/callweaver.init:1.5
--- SOURCES/callweaver.init:1.4	Thu Apr 19 09:51:08 2007
+++ SOURCES/callweaver.init	Thu Apr 26 09:47:28 2007
@@ -21,6 +21,11 @@
 # Get network config
 . /etc/sysconfig/network
 
+
+CALLWEAVER_REALTIME=yes
+CALLWEAVER_SAFE=no
+
+
 # Get service config
 [ -f /etc/sysconfig/callweaver ] && . /etc/sysconfig/callweaver
 
@@ -34,11 +39,24 @@
 	exit 0
 fi
 
+REALDAEMON=/usr/sbin/callweaver
+if is_yes "$CALLWEAVER_SAFE"; then
+	DAEMON=/usr/sbin/safe_callweaver
+else
+	DAEMON=/usr/sbin/callweaver
+fi
+
+if ! is_yes "$CALLWEAVER_REALTIME"; then
+	CALLWEAVER_OPT="$CALLWEAVER_OPT -p"
+fi
+
+RETVAL=0
+# See how we were called.
 start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/callweaver ]; then
 		msg_starting callweaver
-		daemon callweaver $CALLWEAVER_OPTS
+		daemon $DAEMON -U callweaver -G callweaver $CALLWEAVER_OPT
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/callweaver
 	else
@@ -50,7 +68,10 @@
 	# Stop daemons.
 	if [ -f /var/lock/subsys/callweaver ]; then
 		msg_stopping callweaver
-		killproc callweaver
+		daemon $REALDAEMON -rx 'stop now' > /dev/null
+		sleep 2
+		# make sure it's dead
+		killproc callweaver > /dev/null 2>&1
 		rm -f /var/lock/subsys/callweaver >/dev/null 2>&1
 	else
 		msg_not_running callweaver
@@ -72,9 +93,13 @@
 	;;
   reload)
 	if [ -f /var/lock/subsys/callweaver ]; then
-		msg_reloading callweaver
-		busy
-		callweaver -rx reload > /dev/null 2>&1
+		msg_reloading "callweaver configuration"
+		daemon $DAEMON -rx 'reload'
+		# these AFAIK are also reloaded by -rx reload
+		# msg_reloading "callweaver logger"
+		# daemon $DAEMON -rx 'logger reload'
+		# msg_reloading "callweaver extensions"
+		# daemon $DAEMON -rx 'extensions reload'
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/callweaver
 		ok

================================================================
Index: SOURCES/callweaver.sysconfig
diff -u SOURCES/callweaver.sysconfig:1.1 SOURCES/callweaver.sysconfig:1.2
--- SOURCES/callweaver.sysconfig:1.1	Thu Apr 19 09:37:14 2007
+++ SOURCES/callweaver.sysconfig	Thu Apr 26 09:47:28 2007
@@ -1,5 +1,14 @@
 # callweaver startup configuration file
 
-# Try to define nice-level for running asterisk
-SERVICE_RUN_NICE_LEVEL="+5"
+# Try to define nice-level for running callweaver
+SERVICE_RUN_NICE_LEVEL="0"
 
+# yes causes callweaver to be run through safe script which will restart
+# callweaver on crash
+# CALLWEAVER_SAFE=yes
+
+# realtime operation
+CALLWEAVER_REALTIME=yes
+
+# additional options
+# CALLWEAVER_OPT=
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/callweaver.init?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/callweaver.sysconfig?r1=1.1&r2=1.2&f=u