Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr

diff --git a/etc/init.d/indexdata-solr-zookeeper b/etc/init.d/indexdata-solr-zookeeper
index fc090c5..05187eb 100755 (executable)
--- a/etc/init.d/indexdata-solr-zookeeper
+++ b/etc/init.d/indexdata-solr-zookeeper
@@ -22,10 +22,10 @@
 #
 
 PATH=/usr/bin
-DAEMON=/home/dennis/proj/lui-solr/etc/init.d/zookeeper.sh
-SERVICES="/home/indexdata/solr-4.4.0/example/"
+DAEMON=/usr/share/masterkey/lui/solr4/zookeeper/zookeeper.sh
+SERVICES=""
 DESC="Index Data Services (SOLR Zookeeper)"
-NAME=indexdata
+NAME=indexdata-solr-zookeeper
 DEFAULT=/etc/default/indexdata-solr-zookeeper
 if [ -f "$DEFAULT" ] ; then 
     . $DEFAULT
@@ -36,24 +36,37 @@ fi
 set -e
 
 case "$1" in
-  start)
-       for srv in $SERVICES ; do
-           cd $SRV
-           $DAEMON start
+    start)
+       for SERVICE in $SERVICES ; do
+           if [ -d "$SERVICE" ] ; then
+               echo "starting $SERVICE"
+               cd $SERVICE
+               $DAEMON $1
+           else
+               echo "No directory at $SERVICE"
+           fi          
        done
        ;;
-  stop)
-       echo  "Stopping $DESC."
-       for srv in $SERVICES ; do
-           cd $srv
-           $DAEMON stop
+    stop)
+       for SERVICE in $SERVICES ; do
+           if [ -d "$SERVICE" ] ; then
+               echo  "Stopping $SERVICE"
+               cd $SERVICE
+               $DAEMON stop
+           else
+               echo "No directory at $SERVICE"
+           fi
        done
        ;;
   status)
-       echo  "Checking status for $DESC."
-       for srv in $SERVICES ; do
-           cd $srv
-           $srv status
+       for SERVICE in $SERVICES ; do
+           if [ -d "$SERVICE" ] ; then
+               echo  "checking $SERVICE"
+               cd $SERVICE
+               $DAEMON status
+           else
+               echo "No directory at $SERVICE"
+           fi
        done
        ;;
   #reload)

diff --git a/scripts/zookeeper.sh b/scripts/zookeeper.sh
index 329f175..50491e4 100755 (executable)
--- a/scripts/zookeeper.sh
+++ b/scripts/zookeeper.sh
@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 NAME="indexdata-lui-solr-zookeeper"
 HOST=localhost
@@ -43,14 +43,19 @@ OPTIONS=" $SOLR_HOME_OPT -Djetty.port=$PORT ${BOOTSTRAP_OPT} -Dcollection.config
 if [ "$1" == "start" ]; then 
     if [ -f "${PID_FILE}" ] ; then 
        echo "pid file ${PID_FILE} exists. Already running?"
-       exit 1
+    else
+       java $OPTIONS  -jar start.jar > $LOG_FILE & 
+       echo $! > ${PID_FILE}
     fi
-    java $OPTIONS  -jar start.jar > $LOG_FILE & 
-    echo $! > ${PID_FILE}
 elif [ "$1" == "stop" ]; then 
     if [ -f "${PID_FILE}" ] ; then 
-       kill `cat ${PID_FILE}`
-       rm ${PID_FILE}
+       PID="`/bin/cat ${PID_FILE}`"
+       if [ "$PID" != "" ] ; then
+           kill $PID
+           /bin/rm ${PID_FILE}
+       else
+           echo "Unable to extract PID from ${PID_FILE}" 
+       fi
     else
        echo "No pid file ($PID_FILE) found"
     fi