From 29832190cfec7d4e06e3a8a6b2bced73b5b01eec Mon Sep 17 00:00:00 2001
From: Keith Whyte <keith@rhizomatica.org>
Date: Mon, 23 Jan 2023 23:07:01 +0100
Subject: [PATCH] Refactor how we restart FS when neccesary

Sometimes RCCN updates require FS to restart, we don't do this because
we don't want to drop calls, instead we were waiting till the nighttime
when it's likely there are no calls, (we still didn't drop them)

Let's issue a shutdown elegant right away, so FS will restart as soon as 'possible'
---
 .../rhizo_base/files/bin/notify-freeswitch.sh   | 17 +++++++++++++++++
 modules/rhizo_base/files/freeswitch.service     |  1 +
 modules/rhizo_base/manifests/init.pp            |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 modules/rhizo_base/files/bin/notify-freeswitch.sh

diff --git a/modules/rhizo_base/files/bin/notify-freeswitch.sh b/modules/rhizo_base/files/bin/notify-freeswitch.sh
new file mode 100644
index 0000000..968f9a8
--- /dev/null
+++ b/modules/rhizo_base/files/bin/notify-freeswitch.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Puppet has made some change that requires a Freeswitch restart.
+# Place flag file anyway as fallback. Service will delete it
+if [ ! -f /tmp/FS-dirty ] ; then
+  echo 1 > /tmp/FS-dirty
+fi
+
+if [ `/usr/bin/fs_cli -x 'fsctl shutdown_check'` == "true" ] ; then
+  exit
+fi
+
+# Trigger an "elegant" shutdown -
+# (Shutdown when there are no active calls, but don't disable service in the meantime)
+# This won't return until FS actually shuts down.
+exec /usr/bin/fs_cli -x 'fsctl shutdown elegant' &
+
diff --git a/modules/rhizo_base/files/freeswitch.service b/modules/rhizo_base/files/freeswitch.service
index 458fea9..ba0764e 100644
--- a/modules/rhizo_base/files/freeswitch.service
+++ b/modules/rhizo_base/files/freeswitch.service
@@ -8,6 +8,7 @@ PIDFile=/run/freeswitch/freeswitch.pid
 Environment="DAEMON_OPTS=-nonat"
 EnvironmentFile=-/etc/default/freeswitch
 ExecStart=/usr/bin/freeswitch -u root -g freeswitch -ncwait $DAEMON_OPTS
+ExecStopPost=/bin/sh -c "if [ -f /tmp/FS-dirty ]; then rm /tmp/FS-dirty; fi"
 TimeoutSec=45s
 Restart=always
 User=root
diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index b88ea6c..3f6cd77 100644
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@@ -459,7 +459,7 @@ schedule { 'never':
   }
 
   exec { 'notify-freeswitch':
-      command     => '/bin/echo 1 > /tmp/FS-dirty',
+      command     => '/home/rhizomatica/bin/notify-freeswitch.sh',
       refreshonly => true,
     }