Bug 1407: Added/updated OTB startup scripts

.gitattributes

@@ -2371,8 +2371,13 @@ SAS/OTB/jOTDB3/test/tTreeMaintenance.in -text
 SAS/OTB/jOTDB3/test/tTreeMaintenance.java -text
 SAS/OTB/jOTDB3/test/tTreeMaintenance.log_prop -text
 SAS/OTB/jOTDB3/test/testStates.java -text
+SAS/OTB/scripts/CMakeLists.txt -text
+SAS/OTB/scripts/src/CMakeLists.txt -text
 SAS/OTB/scripts/src/checkOTDBServer -text
 SAS/OTB/scripts/src/startOTB -text
+SAS/OTB/scripts/src/startOTBServer -text
+SAS/OTB/scripts/src/startOTBTest -text
+SAS/OTB/scripts/src/stopOTBServer -text
 SAS/OTDB/include/OTDB/DefaultTemplate.h -text
 SAS/OTDB/sql/campaignAPI.sql -text
 SAS/OTDB/sql/fresh_sas001_database.sh -text

SAS/OTB/scripts/CMakeLists.txt

+# $Id: $
+
+add_subdirectory(src)

SAS/OTB/scripts/src/CMakeLists.txt

+# $Id: $
+
+install(PROGRAMS
+  checkOTDBServer
+  startOTB
+  startOTBServer
+  startOTBTest
+  stopOTBServer
+  DESTINATION sbin)

SAS/OTB/scripts/src/startOTB

@@ -3,61 +3,15 @@ export clientDir=/opt/sas/client
 export JAVAHOME=/usr/java/jdk1.6.0_07
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$serverDir
 
-start_server()
-{
-      curdate=`date +%Y%m%dT%H%M%S`
-      logfile="/opt/lofar/log/OTDBServer."$curdate
-      echo "Starting server: $JAVAHOME/bin/java -jar $serverDir/jOTDB2.jar paulus boskabouter LOFAR20 sas001 sas001 $port1 $port2 &" | tee -a $logfile
-      $JAVAHOME/bin/java -jar $serverDir/jOTDB2.jar paulus boskabouter LOFAR20 sas001 sas001 $port1 $port2 2>&1 1>$logfile&
-      serverpid=$!
-}
-
-start_client()
-{
-      # Port 13599 is reserved for MOM-OTDB adapter and should be started 
-      # anyway. But only start OTB client if server has portnumber >= 13601 
-      if [ $port1 -ge 13601 ]; then
-        curdate=`date +%Y%m%dT%H%M%S`
-	logfile="/opt/lofar/log/OTBlog."$curdate
-	
-	echo "Starting client: $JAVAHOME/bin/java -jar $clientDir/OTB.jar -p $port1" | tee -a $logfile
-        $JAVAHOME/bin/java -jar $clientDir/OTB.jar -p $port1 2>&1 1>>$logfile
-        break
-      fi
-}
-
 serverpid=0
-if [ $# -eq 0 ]; then
-  port1=13599
-else
-  port1=$1
-fi
-
-while [ $port1 -le 13620 ] 
-do
-  let port2=port1+1
-  ps -ef | grep -v grep | grep java | grep $port1 2>&1 1>/dev/null
-  if [ $? -ne 0 ]; then
-    start_server
-    start_client
-  else
-    if [ $# -gt 0 ]; then 
-      start_client
-    fi
-  fi
-  let port1+=2
-done
-
-# Check if while loop was exited due to too many instances of server process
-if [ $port1 -gt 13620 ]; then 
-  echo "Too many instances of server proces!"
-  exit 1
+ps -ef | grep -v grep | grep server | grep java | grep 11500 2>&1 1>/dev/null
+if [ $? -ne 0 ]; then
+	echo "starting server first"
+	curdate=`date +%Y%m%dT%H%M%S`
+        $JAVAHOME/bin/java -jar $serverDir/jOTDB3.jar sas001.control.lofar sas001.control.lofar 11500 11501 2>&1 1>/opt/lofar/log/OTBServer.$curdate &
+    serverpid=$!
 fi
 
-# When stopping the client, also stop the server!
-if [ $port1 -ge 13601 -a $serverpid -ne 0 ]; then
-   echo "Stopping server"
-   kill $serverpid
-   sleep 1
-fi
+curdate=`date +%Y%m%dT%H%M%S`
+$JAVAHOME/bin/java -jar $clientDir/OTB.jar -p 11500 2>&1 1>/opt/lofar/log/OTB.$curdate &
 

SAS/OTB/scripts/src/startOTBServer

+export serverDir=/opt/sas/server
+export JAVAHOME=/usr/java/jdk1.6.0_07
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$serverDir
+
+serverpid=0
+ps -ef | grep -v grep | grep server | grep java | grep 11500 2>&1 1>/dev/null
+if [ $? -ne 0 ]; then
+	echo "starting server"
+	curdate=`date +%Y%m%dT%H%M%S`
+        $JAVAHOME/bin/java -jar $serverDir/jOTDB3.jar sas001.control.lofar sas001.control.lofar 11500 11501 2>&1 1>/opt/lofar/log/OTBServer.$curdate &
+else
+        echo "Server already running; kill first!"
+        exit
+fi

SAS/OTB/scripts/src/startOTBTest

+export serverDir=/opt/sas/server
+export clientDir=/opt/sas/client
+export JAVAHOME=/usr/java/jdk1.6.0_07
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$serverDir
+
+serverpid=0
+ps -ef | grep -v grep | grep java | grep 11510 2>&1 1>/dev/null
+if [ $? -ne 0 ]; then
+        $JAVAHOME/bin/java -jar $serverDir/jOTDB3.jar sas001.control.lofar sas001.control.lofar 11510 11511 &
+    serverpid=$!
+fi
+
+
+$JAVAHOME/bin/java -jar $clientDir/OTB.jar -p 11510
+

SAS/OTB/scripts/src/stopOTBServer

+#!/bin/bash
+#
+# Script to stop running OTB server
+#
+
+serverpid=`ps -eaf | grep 11500 | grep server | awk '{print $2}'`
+
+if [ "$serverpid" != "" ]; then 
+  echo "Found OTB server process with PID: "$serverpid
+  kill $serverpid
+  serverpid=`ps -eaf | grep 11500 | grep server | awk '{print $2}'`
+  if [ "$serverpid" != "" ]; then 
+     echo "Could not stop server; try manually"
+  else
+     echo "Server stopped"
+  fi
+fi
+