Skip to content

Commit

Permalink
Add config options for logging
Browse files Browse the repository at this point in the history
  • Loading branch information
thatch45 committed Mar 20, 2011
1 parent d490578 commit 9eb091d
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions salt/config.py
Expand Up @@ -21,6 +21,9 @@ def minion_config(path):
'cachedir': '/var/cache/salt',
'disable_modules': [],
'open_mode': False,
'log_file': '/var/log/salt/master',
'log_level': 'DEBUG',
'out_level': 'ERROR',
}

if os.path.isfile(path):
Expand Down Expand Up @@ -54,6 +57,9 @@ def master_config(path):
'pki_dir': '/etc/salt/pki',
'cachedir': '/var/cache/salt',
'open_mode': False,
'log_file': '/var/log/salt/master',
'log_level': 'DEBUG',
'out_level': 'ERROR',
}

if os.path.isfile(path):
Expand All @@ -73,3 +79,4 @@ def master_config(path):
opts['open_mode'] = False

return opts

0 comments on commit 9eb091d

Please sign in to comment.