[ARVADOS-DEV] updated: e9e9a304e6bde8db0348a4cc6190d79d11241a1a

[git at public.curoverse.com]

Summary of changes:
 arvbox/arvbox | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

       via  e9e9a304e6bde8db0348a4cc6190d79d11241a1a (commit)
      from  c66016db77c59b3e5e5d459bb80d670e8ab075e4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e9e9a304e6bde8db0348a4cc6190d79d11241a1a
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jan 4 13:33:22 2016 -0500

    8080: log and svrestart print out available services

diff --git a/arvbox/arvbox b/arvbox/arvbox
index f953bc1..c06dbcd 100755
--- a/arvbox/arvbox
+++ b/arvbox/arvbox
@@ -113,11 +113,6 @@ case $1 in
         run
         ;;
 
-    svrestart)
-        docker exec -ti $ARVBOX_CONTAINER sv restart $2
-        docker exec -ti $ARVBOX_CONTAINER sv restart ready
-        ;;
-
     ip|open)
         IP=$(docker inspect arvbox | grep \"IPAddress\" | tr -d ' ":,\n' | cut -c10-)
         if test $1 = 'ip' ; then
@@ -136,8 +131,20 @@ case $1 in
         sudo rm -rf $ARVBOX_DATA
         ;;
 
-    log)
-        docker exec -ti $ARVBOX_CONTAINER tail -n40 /etc/service/$2/log/main/current
+    log|svrestart)
+        if test -n "$2" ; then
+            if test "$1" = log ; then
+                docker exec -ti $ARVBOX_CONTAINER tail -n40 /etc/service/$2/log/main/current
+            fi
+            if test "$1" = svrestart ; then
+                docker exec -ti $ARVBOX_CONTAINER sv restart $2
+                docker exec -ti $ARVBOX_CONTAINER sv restart ready
+            fi
+        else
+            echo "Usage: $0 $1 <service>"
+            echo "Available services:"
+            docker exec -ti $ARVBOX_CONTAINER ls /etc/service
+        fi
         ;;
 
     run-tests)
@@ -164,7 +171,7 @@ case $1 in
     *)
         echo "Arvados-in-a-box"
         echo
-        echo "$0 (build|start|run|open|shell|ip|stop|reboot|reset|log|svrestart|tests)"
+        echo "$0 (build|start|run|open|shell|ip|stop|reboot|reset|run-tests|log|svrestart)"
         echo
         echo "build      build arvbox Docker image"
         echo "start|run  start $ARVBOX_CONTAINER container "
@@ -173,9 +180,9 @@ case $1 in
         echo "ip         print arvbox ip address"
         echo "stop       stop arvbox"
         echo "reboot     stop arvbox, build image, run"
-        echo "reset      delete persistent data (careful!)"
-        echo "log <component>       tail log of specified service"
-        echo "svrestart <component> restart specified service inside arvbox"
+        echo "reset      delete persistent data (be careful!)"
         echo "run-tests  run run-tests.sh inside $ARVBOX_CONTAINER container"
+        echo "log       <service> tail log of specified service"
+        echo "svrestart <service> restart specified service inside arvbox"
         ;;
 esac

-----------------------------------------------------------------------


hooks/post-receive
--