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

Report environment failure, if any

Browse source
This commit is contained in:
Bo Maryniuk 2016-02-26 18:31:43 +01:00
parent 63eedefe54
commit 95ec634f00
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/cli/daemons.py
View file

@ -157,8 +157,7 @@ class Master(parsers.MasterOptionParser, DaemonsMixin): # pylint: disable=no-in
for syndic_file in os.listdir(self.config['syndic_dir']):
os.remove(os.path.join(self.config['syndic_dir'], syndic_file))
except OSError as err:
logger.exception('Failed to prepare salt environment')
sys.exit(err.errno)
self.environment_failure(err)
self.setup_logfile_logger()
verify_log(self.config)
@ -269,8 +268,7 @@ class Minion(parsers.MinionOptionParser, DaemonsMixin): # pylint: disable=no-in
verify_files([logfile], self.config['user'])
os.umask(current_umask)
except OSError as err:
logger.exception('Failed to prepare salt environment')
sys.exit(err.errno)
self.environment_failure(err)
self.setup_logfile_logger()
verify_log(self.config)
@ -431,8 +429,7 @@ class ProxyMinion(parsers.ProxyMinionOptionParser, DaemonsMixin): # pylint: dis
os.umask(current_umask)
except OSError as err:
logger.exception('Failed to prepare salt environment')
sys.exit(err.errno)
self.environment_failure(err)
self.setup_logfile_logger()
verify_log(self.config)
@ -531,8 +528,7 @@ class Syndic(parsers.SyndicOptionParser, DaemonsMixin): # pylint: disable=no-in
verify_files([logfile], self.config['user'])
os.umask(current_umask)
except OSError as err:
logger.exception('Failed to prepare salt environment')
sys.exit(err.errno)
self.environment_failure(err)
self.setup_logfile_logger()
verify_log(self.config)