Skip to content

Commit 350ef79

Browse files
committed
Handle timeout errors, default timeout=None same as paramiko
1 parent 4ef7f26 commit 350ef79

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

pssh.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def __init__(self, host,
143143
if _agent:
144144
self.client._agent = _agent
145145
self.num_retries = num_retries
146-
self.timeout = timeout if timeout else 10
146+
self.timeout = timeout
147147
self._connect()
148148

149149
def _connect(self, retries=1):
@@ -168,8 +168,10 @@ def _connect(self, retries=1):
168168
while retries < self.num_retries:
169169
gevent.sleep(5)
170170
return self._connect(retries=retries+1)
171+
172+
error_type = e.args[1] if len(e.args) > 1 else e.args[0]
171173
raise ConnectionErrorException("%s for host '%s:%s' - retry %s/%s",
172-
str(e.args[1]), self.host, self.port,
174+
str(error_type), self.host, self.port,
173175
retries, self.num_retries,)
174176
except paramiko.AuthenticationException, e:
175177
raise AuthenticationException(e)

0 commit comments

Comments
 (0)