Skip to content

Commit 6dc39d4

Browse files
committed
Changes for py2.5 support - added example in readme
1 parent b4e6378 commit 6dc39d4

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,13 @@ Small wrapper library over paramiko that allows for parallel execution of SSH co
55

66
.. image:: https://api.travis-ci.org/pkittenis/parallel-ssh.png?branch=master
77
:target: https://travis-ci.org/pkittenis/parallel-ssh
8+
9+
###
10+
Example
11+
###
12+
13+
from pssh import ParallelSSHClient
14+
hosts = ['myhost1', 'myhost2']
15+
client = ParallelSSHClient(hosts)
16+
cmds = client.exec_command('ls -ltrh /tmp/aasdfasdf', sudo = True)
17+
print [client.get_stdout(cmd) for cmd in cmds]

pssh.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import paramiko
77
import os
8-
import gevent
98
import gevent.pool
109
from gevent import monkey
1110
monkey.patch_all()
@@ -23,9 +22,9 @@
2322

2423
def _setup_logger(_logger):
2524
"""Setup default logger"""
26-
handler = logging.StreamHandler()
25+
_handler = logging.StreamHandler()
2726
log_format = logging.Formatter('%(name)s - %(asctime)s - %(levelname)s - %(message)s')
28-
handler.setFormatter(log_format)
27+
_handler.setFormatter(log_format)
2928
_logger.addHandler(handler)
3029
_logger.setLevel(logging.DEBUG)
3130

@@ -73,11 +72,11 @@ def _connect(self):
7372
try:
7473
self.client.connect(self.host, username = self.user)
7574
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,))
7877
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,))
8180

8281
def exec_command(self, command, sudo = False, **kwargs):
8382
"""Wrapper to paramiko.SSHClient.exec_command"""

0 commit comments

Comments
 (0)