zuul
/
zuul
Code Issues Proposed changes

Merge "Allow loading logging config from yaml" into feature/zuulv3

This commit is contained in:
Jenkins 2017-02-23 19:37:41 +00:00 committed by Gerrit Code Review
parent 28452c246b 7b5b9c632f
commit 15aa91d050
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zuul/cmd/__init__.py
View File

@ -24,6 +24,7 @@ import signal
import sys
import traceback
import yaml
yappi = extras.try_import('yappi')
import zuul.lib.connections
@ -86,7 +87,14 @@ class ZuulApp(object):
if not os.path.exists(fp):
raise Exception("Unable to read logging config file at %s" %
fp)
logging.config.fileConfig(fp)
if os.path.splitext(fp)[1] in ('.yml', '.yaml'):
with open(fp, 'r') as f:
logging.config.dictConfig(yaml.safe_load(f))
else:
logging.config.fileConfig(fp)
else:
logging.basicConfig(level=logging.DEBUG)