valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pylint fixes for config.py

Browse Source
This commit is contained in:
Thomas S Hatch 2011-03-24 22:40:28 -06:00
parent ecf3423a86
commit 90b7085bba
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
salt/config.py
View File

@ -3,7 +3,6 @@ All salt configuration loading and defaults should be in this module
'''
# Import python modules
import os
import sys
import socket
import subprocess
import logging
@ -31,7 +30,7 @@ def minion_config(path):
if os.path.isfile(path):
try:
opts.update(yaml.load(open(path, 'r')))
except:
except Exception:
pass
opts['master_uri'] = 'tcp://' + opts['master'] + ':' + opts['master_port']
@ -76,7 +75,7 @@ def master_config(path):
if os.path.isfile(path):
try:
opts.update(yaml.load(open(path, 'r')))
except:
except Exception:
pass
opts['aes'] = salt.crypt.Crypticle.generate_key_string()
@ -109,17 +108,18 @@ def master_logger(log_file, log_level, console_level):
logger = logging.getLogger()
logger.setLevel(logging.DEBUG)
fh = logging.FileHandler(log_file)
fh.setLevel(getattr(logging, log_level))
fh_ = logging.FileHandler(log_file)
fh_.setLevel(getattr(logging, log_level))
ch = logging.StreamHandler()
ch.setLevel(getattr(logging, console_level))
ch_ = logging.StreamHandler()
ch_.setLevel(getattr(logging, console_level))
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
ch.setFormatter(formatter)
fh.setFormatter(formatter)
logger.addHandler(ch)
logger.addHandler(fh)
fmt = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
formatter = logging.Formatter(fmt)
ch_.setFormatter(formatter)
fh_.setFormatter(formatter)
logger.addHandler(ch_)
logger.addHandler(fh_)
return logger
@ -132,17 +132,18 @@ def minion_logger(log_file, log_level, console_level):
logger = logging.getLogger()
logger.setLevel(logging.DEBUG)
fh = logging.FileHandler(log_file)
fh.setLevel(getattr(logging, log_level))
fh_ = logging.FileHandler(log_file)
fh_.setLevel(getattr(logging, log_level))
ch = logging.StreamHandler()
ch.setLevel(getattr(logging, console_level))
ch_ = logging.StreamHandler()
ch_.setLevel(getattr(logging, console_level))
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
ch.setFormatter(formatter)
fh.setFormatter(formatter)
logger.addHandler(ch)
logger.addHandler(fh)
fmt = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
formatter = logging.Formatter(fmt)
ch_.setFormatter(formatter)
fh_.setFormatter(formatter)
logger.addHandler(ch_)
logger.addHandler(fh_)
return logger