From 887a4714b86a7134100b0eed467326d8b7bc089c Mon Sep 17 00:00:00 2001 From: Pagan Gazzard Date: Wed, 28 Sep 2016 16:43:21 -0700 Subject: [PATCH] Update `dindctl logs` to use journalctl now that we send logs there --- tools/dev/dindctl | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/tools/dev/dindctl b/tools/dev/dindctl index ef679c88..3d0cb202 100755 --- a/tools/dev/dindctl +++ b/tools/dev/dindctl @@ -11,12 +11,6 @@ SUPERVISOR_IMAGE=${SUPERVISOR_IMAGE:-"registry.resindev.io/resin/${ARCH}-supervi PASSWORDLESS_DROPBEAR=${PASSWORDLESS_DROPBEAR:-"false"} SUPERVISOR_EXTRA_MOUNTS= -SUPERVISOR_LOGS=( - '/var/log/supervisor-log/go_supervisor_stdout.log' - '/var/log/supervisor-log/resin_supervisor_stdout.log' - '/var/log/supervisor-log/supervisor/supervisord.log' -) - function showHelp { echo echo " This script can be used to facilitate supervisor development. Its core feature is allowing" @@ -82,14 +76,7 @@ function runDind { } function logs { - if [ "$1" = "-f" ]; then - docker exec -ti resin_supervisor_1 tail -f ${SUPERVISOR_LOGS[@]} - else - for log in "${SUPERVISOR_LOGS[@]}"; do - echo " == ${log} ==" - docker exec -ti resin_supervisor_1 cat "$log" - done - fi + docker exec -ti resin_supervisor_1 journalctl $@ } action="$1"