From a0aa202658fbb3f4f5401fba8a6912a3b708c712 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Wed, 25 Jan 2017 14:16:56 +0000
Subject: [PATCH] updated service scripts

---
 etc/init.d/dm-daq-services  | 31 +++++++++++++++++++++++++++++++
 etc/init.d/dm-ds-services   | 31 +++++++++++++++++++++++++++++++
 etc/init.d/dm-mongo-express |  4 +++-
 etc/init.d/dm-mongodb       |  4 +++-
 4 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100755 etc/init.d/dm-daq-services
 create mode 100755 etc/init.d/dm-ds-services

diff --git a/etc/init.d/dm-daq-services b/etc/init.d/dm-daq-services
new file mode 100755
index 00000000..29f4aec5
--- /dev/null
+++ b/etc/init.d/dm-daq-services
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# Helper script to start and stop DAQ node services
+
+MYDIR=`dirname $0` && cd $MYDIR && MYDIR=`pwd`
+
+# The list below defines order of starting/stopping services
+startList="mongodb mongo-express daq-web-service cat-web-service"
+stopList="cat-web-service daq-web-service mongo-express mongodb"
+restartList=$startList
+statusList=$startList
+
+# Check action
+action=$1
+case $action in
+    start|stop|restart|status)
+    ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart}"
+        exit 1
+esac
+
+# Perform action
+cd $MYDIR
+serviceList="\$"${action}List
+serviceList=`eval "echo $serviceList"`
+for service in $serviceList; do
+    dm-$service $action 
+    sleep 1
+done
+
diff --git a/etc/init.d/dm-ds-services b/etc/init.d/dm-ds-services
new file mode 100755
index 00000000..f678e92c
--- /dev/null
+++ b/etc/init.d/dm-ds-services
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# Helper script to start and stop DAQ node services
+
+MYDIR=`dirname $0` && cd $MYDIR && MYDIR=`pwd`
+
+# The list below defines order of starting/stopping services
+startList="postgresql glassfish ds-web-service"
+stopList="ds-web-service glassfish postgresql"
+restartList=$startList
+statusList=$startList
+
+# Check action
+action=$1
+case $action in
+    start|stop|restart|status)
+    ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart}"
+        exit 1
+esac
+
+# Perform action
+cd $MYDIR
+serviceList="\$"${action}List
+serviceList=`eval "echo $serviceList"`
+for service in $serviceList; do
+    dm-$service $action 
+    sleep 1
+done
+
diff --git a/etc/init.d/dm-mongo-express b/etc/init.d/dm-mongo-express
index 87dcc927..2ce9d9ed 100755
--- a/etc/init.d/dm-mongo-express
+++ b/etc/init.d/dm-mongo-express
@@ -22,6 +22,8 @@
 
 # Arguments
 ACTION=$1
+DM_DB_NAME=$2
+DM_DB_NAME=${DM_DB_NAME:=dm}
 
 # Set root to default if needed.
 MY_DIR=`dirname $0` && cd $MY_DIR && MY_DIR=`pwd`
@@ -48,7 +50,7 @@ DM_NODE_DIR=${DM_OPT_DIR}/node
 DM_FOREVER_DIR=${DM_NODE_DIR}/bin/node_modules/forever
 DM_MONGO_EXPRESS_DIR=${DM_NODE_DIR}/bin/node_modules/mongo-express
 
-DM_DAEMON_NAME="DM Mongo Express"
+DM_DAEMON_NAME="${DM_DB_NAME}.MongoExpress"
 DM_DAEMON_CMD=${DM_FOREVER_DIR}/bin/forever
 DM_DAEMON_WORK_DIR=${DM_INSTALL_DIR}/var/run/mongo-express
 DM_DAEMON_PID_FILE=${DM_INSTALL_DIR}/var/run/mongo-express.pid
diff --git a/etc/init.d/dm-mongodb b/etc/init.d/dm-mongodb
index 78f00a75..d71c21a7 100755
--- a/etc/init.d/dm-mongodb
+++ b/etc/init.d/dm-mongodb
@@ -22,6 +22,8 @@
 
 # Arguments
 ACTION=$1
+DM_DB_NAME=$2
+DM_DB_NAME=${DM_DB_NAME:=dm}
 
 # Set root to default if needed.
 MY_DIR=`dirname $0` && cd $MY_DIR && MY_DIR=`pwd`
@@ -48,7 +50,7 @@ DM_MONGODB_DIR=${DM_OPT_DIR}/mongodb/${DM_HOST_ARCH}
 DM_MONGODB_DATA_DIR=${DM_MONGODB_DIR}/data
 mkdir -p ${DM_MONGODB_DATA_DIR}
 
-DM_DAEMON_NAME="DM MongoDB"
+DM_DAEMON_NAME="${DM_DB_NAME}.MongoDB"
 DM_DAEMON_CMD=${DM_MONGODB_DIR}/bin/mongod
 DM_DAEMON_PID_FILE=${DM_INSTALL_DIR}/var/run/mongodb.pid
 DM_DAEMON_LOG_FILE=${DM_INSTALL_DIR}/var/log/mongodb.log
-- 
GitLab