Set logfile permsissions correctly

Closes #28074
This commit is contained in:
Mike Place 2015-10-19 13:10:51 -06:00
parent 340229355c
commit b416dcc07b

View file

@ -107,7 +107,9 @@ class Master(parsers.MasterOptionParser):
'udp://',
'file://')):
# Logfile is not using Syslog, verify
current_umask = os.umask(0o027)
verify_files([logfile], self.config['user'])
os.umask(current_umask)
# Clear out syndics from cachedir
for syndic_file in os.listdir(self.config['syndic_dir']):
os.remove(os.path.join(self.config['syndic_dir'], syndic_file))
@ -482,7 +484,9 @@ class Syndic(parsers.SyndicOptionParser):
'udp://',
'file://')):
# Logfile is not using Syslog, verify
current_umask = os.umask(0o027)
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)