Commit f6e1bdab by James Cammarata

Ensure ports are set correctly in accelerate module

parent eae0cb5d
...@@ -49,6 +49,16 @@ class Connection(object): ...@@ -49,6 +49,16 @@ class Connection(object):
self.accport = port[1] self.accport = port[1]
self.is_connected = False self.is_connected = False
if not self.port:
self.port = constants.DEFAULT_REMOTE_PORT
elif not isinstance(self.port, int):
self.port = int(self.port)
if not self.accport:
self.accport = constants.ACCELERATE_PORT
elif not isinstance(self.accport, int):
self.accport = int(self.accport)
self.ssh = SSHConnection( self.ssh = SSHConnection(
runner=self.runner, runner=self.runner,
host=self.host, host=self.host,
...@@ -58,9 +68,6 @@ class Connection(object): ...@@ -58,9 +68,6 @@ class Connection(object):
private_key_file=private_key_file private_key_file=private_key_file
) )
if not self.accport:
self.accport = constants.ACCELERATE_PORT
# attempt to work around shared-memory funness # attempt to work around shared-memory funness
if getattr(self.runner, 'aes_keys', None): if getattr(self.runner, 'aes_keys', None):
utils.AES_KEYS = self.runner.aes_keys utils.AES_KEYS = self.runner.aes_keys
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment