Skip to content
Snippets Groups Projects
Commit d6bebca4 authored by Arno Schoenmakers's avatar Arno Schoenmakers
Browse files

Task #1418: Cleanup of obsoleted functionality

parent 9251915f
No related branches found
No related tags found
No related merge requests found
...@@ -4289,13 +4289,6 @@ SAS/OTB/jRSP/.cvsignore -text ...@@ -4289,13 +4289,6 @@ SAS/OTB/jRSP/.cvsignore -text
SAS/OTB/jRSP/include/jRSP/nl_astron_lofar_sas_otb_jrsp_Board.h -text SAS/OTB/jRSP/include/jRSP/nl_astron_lofar_sas_otb_jrsp_Board.h -text
SAS/OTB/jRSP/pom.xml -text SAS/OTB/jRSP/pom.xml -text
SAS/OTB/pom.xml -text svneol=unset#application/xml SAS/OTB/pom.xml -text svneol=unset#application/xml
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/SPRINT_1.8 -text SAS/OTDB/SPRINT_1.8 -text
SAS/OTDB/bin/copyTree.py -text SAS/OTDB/bin/copyTree.py -text
SAS/OTDB/bin/create_new_database.sh -text svneol=unset#application/x-shellscript SAS/OTDB/bin/create_new_database.sh -text svneol=unset#application/x-shellscript
......
...@@ -273,9 +273,6 @@ SAS/OTB/jRSP/configure.in ...@@ -273,9 +273,6 @@ SAS/OTB/jRSP/configure.in
SAS/OTB/jRSP/nbproject SAS/OTB/jRSP/nbproject
SAS/OTB/jRSP/target SAS/OTB/jRSP/target
SAS/OTB/nbproject SAS/OTB/nbproject
SAS/OTB/scripts/Makefile.common
SAS/OTB/scripts/autoconf_share
SAS/OTB/scripts/lofarconf
SAS/OTDB/Makefile.common SAS/OTDB/Makefile.common
SAS/OTDB/autoconf_share SAS/OTDB/autoconf_share
SAS/OTDB/lofarconf SAS/OTDB/lofarconf
# $Id: $
add_subdirectory(src)
# $Id: $
install(PROGRAMS
checkOTDBServer
startOTB
startOTBServer
startOTBTest
stopOTBServer
DESTINATION sbin)
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
check_logfile=/opt/lofar/var/log/checkOTDBServer.log
check_curdate=`date +%Y-%m-%d\ %H:%M:%S`
start_server()
{
curdate=`date +%Y%m%dT%H%M%S`
logfile="/opt/lofar/var/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=$!
}
port1=13599
port2=13600
ps -ef | grep -v grep | grep java | grep $port1 2>&1 1>/dev/null
if [ $? -ne 0 ]; then
start_server
echo "[${check_curdate}]: Started server. See logfile $logfile" >> $check_logfile
else
echo "[${check_curdate}]: Server running" >> $check_logfile
fi
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 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/var/log/OTBServer.$curdate &
serverpid=$!
fi
curdate=`date +%Y%m%dT%H%M%S`
$JAVAHOME/bin/java -jar $clientDir/OTB.jar -p 11500 2>&1 1>/opt/lofar/var/log/OTB.$curdate &
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/var/log/OTBServer.$curdate &
else
echo "Server already running; kill first!"
exit
fi
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
#!/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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment