|
5 | 5 |
|
6 | 6 | import paramiko |
7 | 7 | import os |
8 | | -import gevent |
9 | 8 | import gevent.pool |
10 | 9 | from gevent import monkey |
11 | 10 | monkey.patch_all() |
|
23 | 22 |
|
24 | 23 | def _setup_logger(_logger): |
25 | 24 | """Setup default logger""" |
26 | | - handler = logging.StreamHandler() |
| 25 | + _handler = logging.StreamHandler() |
27 | 26 | log_format = logging.Formatter('%(name)s - %(asctime)s - %(levelname)s - %(message)s') |
28 | | - handler.setFormatter(log_format) |
| 27 | + _handler.setFormatter(log_format) |
29 | 28 | _logger.addHandler(handler) |
30 | 29 | _logger.setLevel(logging.DEBUG) |
31 | 30 |
|
@@ -73,11 +72,11 @@ def _connect(self): |
73 | 72 | try: |
74 | 73 | self.client.connect(self.host, username = self.user) |
75 | 74 | except socket.gaierror, e: |
76 | | - logger.error("Could not resolve host %s" % (self.host,)) |
77 | | - raise UnknownHostException("%s - %s" % (str(e.strerror), self.host,)) |
| 75 | + logger.error("Could not resolve host '%s'" % (self.host,)) |
| 76 | + raise UnknownHostException("%s - %s" % (str(e.args[1]), self.host,)) |
78 | 77 | except socket.error, e: |
79 | | - logger.error("Error connecting to host %s" % (self.host,)) |
80 | | - raise ConnectionErrorException("%s for host '%s'" % (str(e.strerror), self.host,)) |
| 78 | + logger.error("Error connecting to host '%s'" % (self.host,)) |
| 79 | + raise ConnectionErrorException("%s for host '%s'" % (str(e.args[1]), self.host,)) |
81 | 80 |
|
82 | 81 | def exec_command(self, command, sudo = False, **kwargs): |
83 | 82 | """Wrapper to paramiko.SSHClient.exec_command""" |
|
0 commit comments