saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add verification thet the log dir exists

Browse source
This commit is contained in:
Thomas S Hatch 2011-06-02 21:29:54 -06:00
parent 88e77a1b23
commit 85a0a42ca0
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/__init__.py
View file

@ -74,6 +74,7 @@ class Master(object):
verify_env([os.path.join(self.opts['pki_dir'], 'minions'), verify_env([os.path.join(self.opts['pki_dir'], 'minions'),
os.path.join(self.opts['pki_dir'], 'minions_pre'), os.path.join(self.opts['pki_dir'], 'minions_pre'),
os.path.join(self.opts['cachedir'], 'jobs'), os.path.join(self.opts['cachedir'], 'jobs'),
os.path.dirname(self.opts['log_file']),
]) ])
# Late import so logging works correctly # Late import so logging works correctly
import salt.master import salt.master
@ -139,7 +140,9 @@ class Minion(object):
import logging import logging
verify_env([self.opts['pki_dir'], self.opts['cachedir']]) verify_env([self.opts['pki_dir'], self.opts['cachedir'],
os.path.dirname(self.opts['log_file']),
])
if self.cli['daemon']: if self.cli['daemon']:
# Late import so logging works correctly # Late import so logging works correctly
import salt.utils import salt.utils