valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use rlock so blocking can be passed in py2

Browse Source
This commit is contained in:
Daniel Wallace 2018-08-30 11:42:27 -05:00 committed by rallytime
parent d346b42332
commit de98be6093
No known key found for this signature in database
GPG Key ID: E8F1A4B90D0DEA19
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/scripts.py
View File

@ -112,7 +112,7 @@ def minion_process():
def handle_hup(manager, sig, frame): def handle_hup(manager, sig, frame):
manager.minion.reload() manager.minion.reload()
lock = threading.Lock() lock = threading.RLock()
def suicide_when_without_parent(parent_pid): def suicide_when_without_parent(parent_pid):
''' '''
@ -156,7 +156,7 @@ def minion_process():
log.info('waiting random_reauth_delay %ss', delay) log.info('waiting random_reauth_delay %ss', delay)
time.sleep(delay) time.sleep(delay)
sys.exit(salt.defaults.exitcodes.SALT_KEEPALIVE) sys.exit(salt.defaults.exitcodes.SALT_KEEPALIVE)
except SystemExit: except BaseException:
lock.acquire(blocking=True) lock.acquire(blocking=True)
raise raise