Skip to content

Commit

Permalink
Merge pull request #215 from pahaz/pahaz-patch-timeout
Browse files Browse the repository at this point in the history
sshtunnel: set TUNNEL_TIMEOUT = 10.0
  • Loading branch information
pahaz authored Nov 15, 2020
2 parents 856aa94 + 13a9205 commit cd374d5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ CLI usage
ssh_address

Pure python ssh tunnel utils
Version 0.3.0
Version 0.3.1

positional arguments:
ssh_address SSH server IP address (GW for SSH tunnels)
Expand Down
4 changes: 4 additions & 0 deletions changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ CONTRIBUTORS
CHANGELOG
=========


- v.0.3.1 (`Pahaz`_)
+ Increase open connection timeout to 10 secods

- v.0.3.0 (`Pahaz`_)
+ Change default with context behavior to use `.stop(force=True)` on exit (is not fully backward compatible)
+ Remove useless `daemon_forward_servers = True` hack for hangs prevention (is not fully backward compatible)
Expand Down
4 changes: 2 additions & 2 deletions sshtunnel.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
input_ = input


__version__ = '0.3.0'
__version__ = '0.3.1'
__author__ = 'pahaz'


#: Timeout (seconds) for transport socket (``socket.settimeout``)
SSH_TIMEOUT = 0.1 # ``None`` may cause a block of transport thread
#: Timeout (seconds) for tunnel connection (open_channel timeout)
TUNNEL_TIMEOUT = 1.0
TUNNEL_TIMEOUT = 10.0

_DAEMON = False #: Use daemon threads in connections
_CONNECTION_COUNTER = 1
Expand Down

0 comments on commit cd374d5

Please sign in to comment.