commit 4e8761e4ce0cd3fc71e4be3fc33f9ca7d565ff57
author Tamir Duberstein <tamird@google.com> Thu Aug 15 11:14:04 2019 -0400
committer Tamir Duberstein <tamird@google.com> Thu Aug 15 11:23:34 2019 -0400
tree 9d3e016acdf71dd0a3e325643ec6add19e261bf9
parent 41f88dea190e9e83985e2f1767be9d52c43ba48a

Set SSH connection timeout at 10 seconds

This mirrors what was done in 24b7672, setting the connection timeout to
the same value as the keepalive timeout. This allows us to remove the
per-invocation timeouts currently being set in `fx serve-updates` and
`fx wait`, and centralizes the knowledge of acceptable SSH timeouts.

Bug: 21491
Change-Id: I531720f96cff9f46e84f1a1e159590f600ce841c

fuchsia/developer-keys/generate_ssh_config.sh

diff --git a/fuchsia/developer-keys/generate_ssh_config.sh b/fuchsia/developer-keys/generate_ssh_config.sh
index e406bbe..de4a4a8 100755
--- a/fuchsia/developer-keys/generate_ssh_config.sh
+++ b/fuchsia/developer-keys/generate_ssh_config.sh
@@ -13,6 +13,7 @@
   ControlPersist yes
   ControlMaster auto
   ControlPath /tmp/fuchsia-$USER-%r@%h:%p
+  ConnectTimeout 10
   ServerAliveInterval 1
   ServerAliveCountMax 10
   LogLevel ERROR