홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
alshabib
e8641634 2 parents a43aa252 756fb29d

Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

Inline Side-by-side
Showing 3 changed files with 10 additions and 3 deletions
...@@ -7,7 +7,10 @@ ...@@ -7,7 +7,10 @@
7 . $ONOS_ROOT/tools/build/envDefaults 7 . $ONOS_ROOT/tools/build/envDefaults
8 8
9 remote=$ONOS_USER@${1:-$OCI} 9 remote=$ONOS_USER@${1:-$OCI}
10 +instance=$2
10 11
11 -LOG=$ONOS_INSTALL_DIR/log/karaf.log 12 +[ -n "$instance" ] && \
13 + LOG=$ONOS_INSTALL_DIR/$KARAF_DIST/instances/$instance/data/log/karaf.log || \
14 + LOG=$ONOS_INSTALL_DIR/log/karaf.log
12 15
13 ssh $remote "egrep 'ERROR|Exception' $LOG" 16 ssh $remote "egrep 'ERROR|Exception' $LOG"
......
...@@ -39,8 +39,9 @@ ssh $remote " ...@@ -39,8 +39,9 @@ ssh $remote "
39 [ -z "$nostart" ] && sudo cp $ONOS_INSTALL_DIR/debian/onos.conf /etc/init/onos.conf 39 [ -z "$nostart" ] && sudo cp $ONOS_INSTALL_DIR/debian/onos.conf /etc/init/onos.conf
40 echo 'export ONOS_OPTS=debug' > $ONOS_INSTALL_DIR/options 40 echo 'export ONOS_OPTS=debug' > $ONOS_INSTALL_DIR/options
41 41
42 - # Remove any previous ON.Lab bits from ~/.m2 repo 42 + # Remove any previous ON.Lab bits from ~/.m2 repo and re-stage it.
43 rm -fr ~/.m2/repository/org/onlab 43 rm -fr ~/.m2/repository/org/onlab
44 + cp -r $ONOS_INSTALL_DIR/$KARAF_DIST/system/org/onlab ~/.m2/repository/org/onlab
44 45
45 # Drop log level for the console 46 # Drop log level for the console
46 echo "log4j.logger.org.apache.sshd = WARN" \ 47 echo "log4j.logger.org.apache.sshd = WARN" \
......
...@@ -7,8 +7,11 @@ ...@@ -7,8 +7,11 @@
7 . $ONOS_ROOT/tools/build/envDefaults 7 . $ONOS_ROOT/tools/build/envDefaults
8 8
9 remote=$ONOS_USER@${1:-$OCI} 9 remote=$ONOS_USER@${1:-$OCI}
10 +instance=$2
10 11
11 -LOG=$ONOS_INSTALL_DIR/log/karaf.log 12 +[ -n "$instance" ] && \
13 + LOG=$ONOS_INSTALL_DIR/$KARAF_DIST/instances/$instance/data/log/karaf.log || \
14 + LOG=$ONOS_INSTALL_DIR/log/karaf.log
12 15
13 trap "ssh $remote 'ps -ef | grep \"tail -n 512\" | grep -v grep | cut -c10-15 | xargs kill'" EXIT 16 trap "ssh $remote 'ps -ef | grep \"tail -n 512\" | grep -v grep | cut -c10-15 | xargs kill'" EXIT
14 17
......