saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve timeout in delete

Browse source 
Improved error handling
This commit is contained in:
twangboy 2018-08-16 15:01:18 -06:00
parent a6ecb7552d
commit 4f9973db20
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
salt/modules/win_service.py
View file

@ -1357,16 +1357,20 @@ def delete(name, timeout=90):
handle_scm, name, win32service.SERVICE_ALL_ACCESS)
except pywintypes.error as exc:
raise CommandExecutionError(
'Failed To Open {0}: {1}'.format(name, exc[2]))
'Failed to open {0}. {1}'.format(name, exc.strerror))
win32service.DeleteService(handle_svc)
try:
win32service.DeleteService(handle_svc)
except pywintypes.error as exc:
raise CommandExecutionError(
'Failed to delete {0}. {1}'.format(name, exc.strerror))
finally:
log.debug('Cleaning up')
win32service.CloseServiceHandle(handle_scm)
win32service.CloseServiceHandle(handle_svc)
win32service.CloseServiceHandle(handle_scm)
win32service.CloseServiceHandle(handle_svc)
attempts = 0
while name in get_all() and attempts <= timeout:
end_time = time.time() + int(timeout)
while name in get_all() and time.time() < end_time:
time.sleep(1)
attempts += 1
return name not in get_all()