mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-11-05 10:41:56 +01:00
Code Issues Projects Releases Wiki Activity

Allowing Ctrl-C to stop the locally run server.

Browse Source 
Change-Id: I8767cdf8af6157a291ae1588cd7dc46eb4cc4c34
This commit is contained in:
Thomas Vachuska 2016-11-17 13:31:57 -08:00
parent 397befca9b
commit fdb4755820
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/package/onos-run-karaf
View File

@ -78,12 +78,18 @@ fi
./bin/onos-service server "$@" &>onos.log & ./bin/onos-service server "$@" &>onos.log &
echo "$!" > /tmp/onos.pid echo "$!" > /tmp/onos.pid
function killServer() {
echo "Killing ONOS server..."
kill -9 $(cat /tmp/onos.pid) 2>/dev/null
}
# Hang-on a bit and then start tailing the ONOS log output # Hang-on a bit and then start tailing the ONOS log output
MAX_RETRY=30 MAX_RETRY=30
echo "Waiting for karaf.log" echo "Waiting for karaf.log"
until [ $MAX_RETRY -le 0 ]; do until [ $MAX_RETRY -le 0 ]; do
KARAF_LOG=$(find $ONOS_HOME -type f -name karaf.log) KARAF_LOG=$(find $ONOS_HOME -type f -name karaf.log)
if [ $KARAF_LOG ]; then if [ $KARAF_LOG ]; then
trap killServer INT
tail -f $KARAF_LOG tail -f $KARAF_LOG
return return
fi fi
@ -91,4 +97,4 @@ until [ $MAX_RETRY -le 0 ]; do
sleep 1 sleep 1
done done
echo "Fail to open karaf.log" echo "Fail to open karaf.log"
killServer