From d0ae606559207d9f5b16741cbe964ffdc334af45 Mon Sep 17 00:00:00 2001
From: Richard Whitehouse <github@richardwhiuk.com>
Date: Wed, 24 May 2017 20:30:46 +0000
Subject: [PATCH 1/2] Don't run Ralf if there is no Ralf hostname.

Add/remove the monit script based on whether Ralf is present

Prevent Ralf from starting if there is no configured Ralf hostname
---
 debian/ralf.init.d                               |  5 +++++
 .../clearwater/infrastructure/scripts/ralf.monit | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/debian/ralf.init.d b/debian/ralf.init.d
index c9b3136..c4b9a43 100644
--- a/debian/ralf.init.d
+++ b/debian/ralf.init.d
@@ -153,6 +153,11 @@ do_start()
         #   1 if daemon was already running
         #   2 if daemon could not be started
 
+        # Exit if there is no ralf hostname configured
+        if [ -z "$ralf_hostname" ]; then
+          return 2
+        fi
+
         # Allow us to write to the pidfile directory
         install -m 755 -o $NAME -g root -d /var/run/$NAME && chown -R $NAME /var/run/$NAME
 
diff --git a/ralf.root/usr/share/clearwater/infrastructure/scripts/ralf.monit b/ralf.root/usr/share/clearwater/infrastructure/scripts/ralf.monit
index 6d051ee..4e159a0 100755
--- a/ralf.root/usr/share/clearwater/infrastructure/scripts/ralf.monit
+++ b/ralf.root/usr/share/clearwater/infrastructure/scripts/ralf.monit
@@ -11,6 +11,20 @@
 
 . /etc/clearwater/config
 
+if [ -z "$ralf_hostname" ]; then
+
+  if [ -f /etc/monit/conf.d/ralf.monit ]; then
+    rm /etc/monit/conf.d/ralf.monit
+
+    # Force monit to reload its configuration
+    reload clearwater-monit || true
+
+    # Stop ralf if it was running
+    service ralf stop
+  fi
+
+else
+
 # Set up the monit configuration for ralf with the right IP addresses and ports
 cat > /etc/monit/conf.d/ralf.monit <<EOF
 # Check the Ralf process.
@@ -48,3 +62,5 @@ chmod 0644 /etc/monit/conf.d/ralf.monit
 
 # Force monit to reload its configuration
 reload clearwater-monit || true
+
+fi

From a712cdc30b833d1cca5c4069ee0fc702fa532ddb Mon Sep 17 00:00:00 2001
From: Richard Whitehouse <github@richardwhiuk.com>
Date: Tue, 13 Jun 2017 20:01:19 +0000
Subject: [PATCH 2/2] Resolve review markups

---
 debian/ralf.init.d                                    |  5 -----
 .../clearwater/infrastructure/scripts/ralf.monit      | 11 ++++++-----
 src/main.cpp                                          |  9 ++++++++-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/debian/ralf.init.d b/debian/ralf.init.d
index c4b9a43..c9b3136 100644
--- a/debian/ralf.init.d
+++ b/debian/ralf.init.d
@@ -153,11 +153,6 @@ do_start()
         #   1 if daemon was already running
         #   2 if daemon could not be started
 
-        # Exit if there is no ralf hostname configured
-        if [ -z "$ralf_hostname" ]; then
-          return 2
-        fi
-
         # Allow us to write to the pidfile directory
         install -m 755 -o $NAME -g root -d /var/run/$NAME && chown -R $NAME /var/run/$NAME
 
diff --git a/ralf.root/usr/share/clearwater/infrastructure/scripts/ralf.monit b/ralf.root/usr/share/clearwater/infrastructure/scripts/ralf.monit
index 4e159a0..4e9e5e4 100755
--- a/ralf.root/usr/share/clearwater/infrastructure/scripts/ralf.monit
+++ b/ralf.root/usr/share/clearwater/infrastructure/scripts/ralf.monit
@@ -25,8 +25,8 @@ if [ -z "$ralf_hostname" ]; then
 
 else
 
-# Set up the monit configuration for ralf with the right IP addresses and ports
-cat > /etc/monit/conf.d/ralf.monit <<EOF
+  # Set up the monit configuration for ralf with the right IP addresses and ports
+  cat > /etc/monit/conf.d/ralf.monit <<EOF
 # Check the Ralf process.
 
 # Monitor the service's PID file and memory use.
@@ -58,9 +58,10 @@ check program poll_ralf with path "/usr/share/clearwater/bin/poll_ralf.sh"
   # Aborting generates a core file and triggers diagnostic collection.
   if status != 0 for 2 cycles then exec "/bin/bash -c '/usr/share/clearwater/bin/issue-alarm monit 2000.3; /etc/init.d/ralf abort'"
 EOF
-chmod 0644 /etc/monit/conf.d/ralf.monit
 
-# Force monit to reload its configuration
-reload clearwater-monit || true
+  chmod 0644 /etc/monit/conf.d/ralf.monit
+
+  # Force monit to reload its configuration
+  reload clearwater-monit || true
 
 fi
diff --git a/src/main.cpp b/src/main.cpp
index bd83685..c266356 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -571,6 +571,13 @@ int main(int argc, char**argv)
     }
   }
 
+  // Check we've been provided with a hostname
+  if (options.ralf_hostname == "")
+  {
+    TRC_ERROR("No Ralf hostname provided - exiting");
+    return 1;
+  }
+
   // Parse the session-stores argument.
   std::string session_store_location;
   std::vector<std::string> remote_session_stores_locations;
@@ -775,7 +782,7 @@ int main(int argc, char**argv)
   std::string chronos_callback_addr = "127.0.0.1:" + port_str;
   int http_af = AF_INET;
 
-  if (options.chronos_hostname == "" || options.ralf_hostname == "")
+  if (options.chronos_hostname == "")
   {
     // If we are using a local chronos cluster, we want Chronos to call back to
     // its local Ralf instance so that we can handle Ralfs failing without missing