X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Futil%2Fserver.py;h=2cdf7bdac8cf57e5296c0c80c4ed0fdc84d3871a;hb=5d8a0f74de55f70c290633a26b931dd503adb345;hp=c53cc4e369d44416f467f48f3214228e6e2d9b53;hpb=62aa9b7a5b846baed4dd304e2d8fa442f9f35b51;p=nepi.git

diff --git a/src/nepi/util/server.py b/src/nepi/util/server.py
index c53cc4e3..2cdf7bda 100644
--- a/src/nepi/util/server.py
+++ b/src/nepi/util/server.py
@@ -608,7 +608,7 @@ def popen_ssh_command(command, host, port, user, agent,
         timeout = None,
         retry = 0,
         err_on_timeout = True,
-        connect_timeout = 30,
+        connect_timeout = 90,
         persistent = True,
         hostip = None):
     """
@@ -624,7 +624,7 @@ def popen_ssh_command(command, host, port, user, agent,
             '-o', 'NoHostAuthenticationForLocalhost=yes',
             '-o', 'ConnectTimeout=%d' % (int(connect_timeout),),
             '-o', 'ConnectionAttempts=3',
-            '-o', 'ServerAliveInterval=30',
+            '-o', 'ServerAliveInterval=60',
             '-o', 'TCPKeepAlive=yes',
             '-l', user, hostip or host]
     if persistent and openssh_has_persist():
@@ -737,9 +737,9 @@ def popen_scp(source, dest,
         args = ['ssh', '-l', user, '-C',
                 # Don't bother with localhost. Makes test easier
                 '-o', 'NoHostAuthenticationForLocalhost=yes',
-                '-o', 'ConnectTimeout=30',
+                '-o', 'ConnectTimeout=90',
                 '-o', 'ConnectionAttempts=3',
-                '-o', 'ServerAliveInterval=30',
+                '-o', 'ServerAliveInterval=60',
                 '-o', 'TCPKeepAlive=yes',
                 host ]
         if openssh_has_persist():
@@ -871,9 +871,9 @@ def popen_scp(source, dest,
         args = ['scp', '-q', '-p', '-C',
                 # Don't bother with localhost. Makes test easier
                 '-o', 'NoHostAuthenticationForLocalhost=yes',
-                '-o', 'ConnectTimeout=30',
+                '-o', 'ConnectTimeout=90',
                 '-o', 'ConnectionAttempts=3',
-                '-o', 'ServerAliveInterval=30',
+                '-o', 'ServerAliveInterval=60',
                 '-o', 'TCPKeepAlive=yes' ]
                 
         if port:
@@ -974,7 +974,7 @@ def popen_python(python_code,
                 # Don't bother with localhost. Makes test easier
                 '-o', 'NoHostAuthenticationForLocalhost=yes',
                 '-o', 'ConnectionAttempts=3',
-                '-o', 'ServerAliveInterval=30',
+                '-o', 'ServerAliveInterval=60',
                 '-o', 'TCPKeepAlive=yes',
                 '-l', user, host]
         if agent: