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

use os._exit instead of sys.exit when daemonizing

Browse source 
According to the docs [here](https://docs.python.org/3/library/os.html#os._exit)

> `os._exit` should should normally only be used in the child process after a fork().

This will exit the process with status n, without calling cleanup
handlers, flushing stdio buffers, etc.

Fixes saltstack/salt-jenkins#1075
This commit is contained in:
Daniel Wallace 2018-08-23 19:05:55 -05:00
parent 158c1ca575
commit e06ce49c1b
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/process.py
View file

@ -71,7 +71,7 @@ def daemonize(redirect_out=True):
if pid > 0:
# exit first parent
salt.utils.crypt.reinit_crypto()
sys.exit(salt.defaults.exitcodes.EX_OK)
os._exit(salt.defaults.exitcodes.EX_OK)
except OSError as exc:
log.error('fork #1 failed: %s (%s)', exc.errno, exc)
sys.exit(salt.defaults.exitcodes.EX_GENERIC)