entrouvert
/
wcs-olap
16
0
Fork 0
Code Issues Pull Requests Releases Activity

cumulate global, site and user wcs-olap.ini config file (#17474)

This commit is contained in:
Thomas NOËL 2018-01-10 15:28:07 +01:00 committed by Frédéric Péters
parent f03b05cba9
commit f39ea073d5
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wcs_olap/cmd.py
View File

@ -24,18 +24,17 @@ def main():
def get_config(path=None):
config = ConfigParser.ConfigParser()
global_config_path = '/etc/wcs_olap.ini'
user_config_path = os.path.expanduser('~/.wcs_olap.ini')
global_config_path = '/etc/wcs-olap/config.ini'
user_config_path = os.path.expanduser('~/.wcs-olap.ini')
if not path:
if os.path.exists(user_config_path):
path = user_config_path
elif os.path.exists(global_config_path):
path = global_config_path
else:
return config
config.read(path)
paths = [global_config_path, user_config_path]
else:
paths = [global_config_path, path, user_config_path]
read_files = config.read(paths)
if config.has_section('loggers'):
logging.config.fileConfig(path)
logging.config.fileConfig(paths)
logger = logging.getLogger('wcs-olap')
logger.info('config files: %s', ', '.join(read_files))
return config