commit eca13a353fcec59b466f2a57fd9d852c188e4e07
author James Tucker <raggi@google.com> Mon Dec 10 17:01:02 2018 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue Dec 11 19:42:44 2018 +0000
tree 9e4ff0394e2c32ee3d48b35eeba2f351cf377895
parent 9e84143aa77d5f74b6b30de257f6ec22f0ee47df

[syslog] wait using ssh, instead of netaddr

This is a simpler solution and also involves (in the future) less log spam.

Test: local, checked that ctrl+c also works as desired.
Change-Id: I88a674385c368ca498fb890ed0dec8c649b68ded

devshell/syslog

diff --git a/devshell/syslog b/devshell/syslog
index e62271d..7fe3f6e 100755
--- a/devshell/syslog
+++ b/devshell/syslog
@@ -16,20 +16,14 @@
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"/lib/vars.sh
 
 function listen {
-  trap "exit 0" INT
   while true; do
-    addr="$(get-fuchsia-device-addr --nowait --timeout=1000)"
-    if [[ -n "${addr}" ]]; then
-      echo "Connecting to device (${addr})..."
-      (fx-command-exec ssh "${addr}" log_listener "$@" || true)
-      if [[ $? -eq 0 ]]; then
-        break
-      fi
-    fi
+    fx-command-run wait || return
+    fx-command-run shell log_listener "$@"
+    echo "Connection lost, reconnecting..."
   done
 }
 
-echo "Looking for device"
+echo "Connecting..."
 if [[ $# > 0 && "$1" = "--raw" ]]; then
   shift
   listen "$@"