Call sys.exit() instead of exit()

This commit is contained in:
Pedro Algarvio 2016-06-14 00:34:38 +01:00
parent 8f56406507
commit 34f7d90d9f
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
5 changed files with 7 additions and 5 deletions

View file

@ -865,7 +865,7 @@ class Minion(MinionBase):
self.process_manager.send_signal_to_processes(signum)
# kill any remaining processes
self.process_manager.kill_children()
exit(0)
sys.exit(0)
def sync_connect_master(self, timeout=None):
'''

View file

@ -92,7 +92,7 @@ def minion_process():
delay = randint(1, delay)
log.info('waiting random_reauth_delay {0}s'.format(delay))
time.sleep(delay)
exit(salt.defaults.exitcodes.SALT_KEEPALIVE)
sys.exit(salt.defaults.exitcodes.SALT_KEEPALIVE)
def salt_minion():

View file

@ -6,6 +6,7 @@ Zeromq transport classes
# Import Python Libs
from __future__ import absolute_import
import os
import sys
import copy
import errno
import signal
@ -636,7 +637,7 @@ class ZeroMQReqServerChannel(salt.transport.mixins.auth.AESReqServerMixin, salt.
msg += 'SIGTERM'
msg += '. Exiting'
log.debug(msg)
exit(salt.defaults.exitcodes.EX_OK)
sys.exit(salt.defaults.exitcodes.EX_OK)
class ZeroMQPubServerChannel(salt.transport.server.PubServerChannel):

View file

@ -652,7 +652,7 @@ class SignalHandlingMultiprocessingProcess(MultiprocessingProcess):
msg += 'SIGTERM'
msg += '. Exiting'
log.debug(msg)
exit(salt.defaults.exitcodes.EX_OK)
sys.exit(salt.defaults.exitcodes.EX_OK)
def start(self):
with default_signals(signal.SIGINT, signal.SIGTERM):

View file

@ -256,6 +256,7 @@ dictionary, othewise it will be ignored.
# Import python libs
from __future__ import absolute_import, with_statement
import os
import sys
import time
import signal
import datetime
@ -788,7 +789,7 @@ class Schedule(object):
finally:
if multiprocessing_enabled:
# Let's make sure we exit the process!
exit(salt.defaults.exitcodes.EX_GENERIC)
sys.exit(salt.defaults.exitcodes.EX_GENERIC)
def eval(self):
'''