mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-04 19:56:49 +02:00
Code Issues Projects Releases Wiki Activity

Fixed onos-log so ctrl-c will only kill the current monitor an added onos-log-kill command to kill all monitors.

Browse Source 
Change-Id: Id76b13f801aae0d9878baa265601717ef20613c8
This commit is contained in:
Thomas Vachuska 2015-02-19 14:53:44 -08:00
parent 27a5cc8b45
commit 33bd2302ce
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/test/bin/onos-log
View File

@ -23,12 +23,11 @@ instance=$2
if [ $less -eq 1 ]; then
ssh -t $remote "less $LOG"
else
trap "ssh $remote 'ps -ef | grep \"tail -n 512\" | grep -v grep | cut -c10-15 | xargs kill'" EXIT
ssh -t $remote "
while true; do
echo ==================================================================
[ ! -f $LOG ] && sleep 2 && continue
tail -n 512 --follow=name $LOG --sleep-interval 2
tail -n 512 --follow=name $LOG --pid \$$ --sleep-interval 2
done
"
fi

16
tools/test/bin/onos-log-kill Executable file
View File

@ -0,0 +1,16 @@
#!/bin/bash
# -----------------------------------------------------------------------------
# Kills all remote ONOS log file monitors on the specified node.
# -----------------------------------------------------------------------------
[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
. $ONOS_ROOT/tools/build/envDefaults
. $ONOS_ROOT/tools/test/bin/find-node.sh
less=0
[ "$1" = "-l" ] && shift && less=1
remote=$(find_node $1)
remote=$ONOS_USER@${remote:-$OCI}
ssh $remote "ps -ef | grep \"tail -n 512\" | grep -v grep | cut -c10-15 | xargs kill"