aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@google.com>2016-04-15 07:33:29 +0100
committerPascal Terjan <pterjan@google.com>2016-04-15 07:33:29 +0100
commit9e39fa2cdc1f7b1056b05f48dba9c80239d07076 (patch)
tree8188a99a7da2e64b273ea2ab794c885e14f55c2e
parent6c2bdcdfde1c386dcb6deb8ed7ca42276c8211a6 (diff)
downloadiurt-9e39fa2cdc1f7b1056b05f48dba9c80239d07076.tar
iurt-9e39fa2cdc1f7b1056b05f48dba9c80239d07076.tar.gz
iurt-9e39fa2cdc1f7b1056b05f48dba9c80239d07076.tar.bz2
iurt-9e39fa2cdc1f7b1056b05f48dba9c80239d07076.tar.xz
iurt-9e39fa2cdc1f7b1056b05f48dba9c80239d07076.zip
Enable ServerAliveInterval by default
-rw-r--r--NEWS2
-rwxr-xr-xulri2
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index d59bc1c..37ba350 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
- ulri: when failing to send a build to a machine do not try sending all the
other pending builds there
-- ulri: reduce ssh ConnectTimeout to 5, no point waiting 20s
+- ulri: reduce ssh ConnectTimeout to 5 and enable ServerAliveInterval
- ulri, emi:
o move some code to library functions
o share the code loading the state from the file tree
diff --git a/ulri b/ulri
index 54930ae..4473eaa 100755
--- a/ulri
+++ b/ulri
@@ -168,7 +168,7 @@ my %config_usage = (
},
ssh_options => {
desc => "SSH options",
- default => "-o ConnectTimeout=5 -o BatchMode=yes"
+ default => "-o ConnectTimeout=5 -o BatchMode=yes -o ServerAliveInterval=5"
},
packager => {
desc => 'Default packager tag user by bot',