kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always attempt to close SSH gracefully

Browse source
This commit is contained in:
Anders Ingemann 2015-01-25 17:32:23 +01:00
parent e9a3845281
commit a0e3ba218f
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bootstrapvz/remote/build_servers/remote.py
View file

@ -63,13 +63,17 @@ class RemoteBuildServer(BuildServer):
'local_callback_port': local_callback_port, 'local_callback_port': local_callback_port,
'remote_server_port': remote_server_port, 'remote_server_port': remote_server_port,
'remote_callback_port': remote_callback_port} 'remote_callback_port': remote_callback_port}
except (Exception, KeyboardInterrupt): finally:
log.debug('Waiting for SSH connection to the build server to close')
import time
start = time.time()
while ssh_process.poll() is None:
if time.time() - start > 5:
log.debug('Forcefully terminating SSH connection to the build server') log.debug('Forcefully terminating SSH connection to the build server')
ssh_process.terminate() ssh_process.terminate()
raise break
else: else:
log.debug('Waiting for SSH connection to the build server to close') time.sleep(0.5)
ssh_process.wait()
def download(self, src, dst): def download(self, src, dst):
log.debug('Downloading file `{src}\' from ' log.debug('Downloading file `{src}\' from '