afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed circular dependency causing issues in python2

Browse source
This commit is contained in:
Blake Harnden 2019-10-04 12:36:15 -07:00
parent 70bb1598e1
commit bb98a4a77f
6 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/utils.py
View file

@ -16,7 +16,6 @@ import sys
from past.builtins import basestring
from core import constants
from core.errors import CoreCommandError
DEVNULL = open(os.devnull, "wb")
@ -451,16 +450,13 @@ def load_classes(path, clazz):
return classes
def load_logging_config(config_path=None):
def load_logging_config(config_path):
"""
Load CORE logging configuration file.
:param str config_path: path to logging config file,
when None defaults to /etc/core/logging.conf
:param str config_path: path to logging config file
:return: nothing
"""
if not config_path:
config_path = os.path.join(constants.CORE_CONF_DIR, "logging.conf")
with open(config_path, "r") as log_config_file:
log_config = json.load(log_config_file)
logging.config.dictConfig(log_config)