x
/
solar
Code Issues Proposed changes

Fabric sync transport does not exit anymore 

- Custom Executor class that handles abort_exception in fabric

Change-Id: Ief0cd4cc19d6be470a102f9c5b2205cceb75ff38
Closes-bug: #1549326
This commit is contained in:
Jedrzej Nowak 2016-02-26 13:26:14 +01:00
parent 9f04c94f03
commit de2f683837
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
solar/core/transports/ssh.py
View File

@ -23,6 +23,13 @@ from solar.core.transports.base import Executor
from solar.core.transports.base import RunTransport
from solar.core.transports.base import SolarTransportResult
from solar.core.transports.base import SyncTransport
from solar import errors
class ExecutorForFabric(Executor):
def _abort_exception(self, output):
raise errors.SolarError(output)
class _SSHTransport(object):
@ -82,17 +89,18 @@ class SSHSyncTransport(SyncTransport, _SSHTransport):
else:
executor = self._copy_directory(resource, _from, _to, use_sudo)
# with fabric_api.settings(**self._fabric_settings(resource)):
# return executor()
executor = Executor(resource=resource,
executor=executor,
params=(_from, _to, use_sudo))
executor = ExecutorForFabric(resource=resource,
executor=executor,
params=(_from, _to, use_sudo))
self.executors.append(executor)
def run_all(self):
for executor in self.executors:
resource = executor.resource
with fabric_api.settings(**self.settings(resource)):
with fabric_api.settings(
abort_exception=executor._abort_exception,
**self.settings(resource)
):
executor.run(self)