From 3b6855da3e70b7dc5a00ad273aea79a732c89306 Mon Sep 17 00:00:00 2001
From: Daniel Dickinson <crazycshore@gmail.com>
Date: Sun, 27 Jun 2010 13:36:24 +0000
Subject: [PATCH] net/freeswitch: Fixed restart so that it waits for FS to
 terminated before attempting to start a new instance

SVN-Revision: 21964
---
 net/freeswitch/Makefile              |  7 +++++--
 net/freeswitch/files/freeswitch.init | 13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 2539b43969..e3da8a00f0 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -181,7 +181,8 @@ $(call Package/freeswitch/Default)
 		+freeswitch-mod-tone-stream \
 		+freeswitch-mod-voipcodecs \
 		+freeswitch-mod-xml-curl \
-		+freeswitch-mod-xml-rpc
+		+freeswitch-mod-xml-rpc \
+		+freeswitch-tools
 endef
 
 # mod_lua is included in FreeSWITCH minimal because it is intended to be used
@@ -195,12 +196,14 @@ $(call Package/freeswitch/Default)
 		+freeswitch-mod-console \
 		+freeswitch-mod-dialplan-xml \
 		+freeswitch-mod-dptools \
+		+freeswitch-mod-event-socket \
 		+freeswitch-mod-local-stream \
 		+freeswitch-mod-sndfile \
 		+freeswitch-mod-sofia \
 		+freeswitch-mod-tone-stream \
 		+freeswitch-mod-voipcodecs \
-		+freeswitch-mod-lua
+		+freeswitch-mod-lua \
+		+freeswitch-tools
 endef
 
 define Package/freeswitch-sounds-en
diff --git a/net/freeswitch/files/freeswitch.init b/net/freeswitch/files/freeswitch.init
index 11950568d0..a155724dac 100644
--- a/net/freeswitch/files/freeswitch.init
+++ b/net/freeswitch/files/freeswitch.init
@@ -22,3 +22,16 @@ stop() {
 	[ -f $DEFAULT ] && . $DEFAULT
 	$FS_DIR/usr/bin/freeswitch $OPTIONS -stop
 }
+
+restart() {
+	# stopping freeswitch is non-blocking, so we wait until freeswitch's 
+	# event socket is down, and then wait an additional ten seconds so that 
+	# freeswitch should be completely shutdown before we start it again
+	local retval
+	stop
+	fs_cli -x status >/dev/null 2>&1
+	retval=$?
+	while [ $retval -eq 0 ]; do sleep 1; fs_cli -x status >/dev/null 2>&1; retval=$?; done
+	sleep 10
+	start
+}
-- 
2.30.2