From 357b49958226e9cd3827954622fedbc57e1ad15a Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Thu, 6 Jul 2017 15:13:35 -0400 Subject: [PATCH] ceph-volume: log: use new config module Signed-off-by: Alfredo Deza --- src/ceph-volume/ceph_volume/log.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ceph-volume/ceph_volume/log.py b/src/ceph-volume/ceph_volume/log.py index b78752acea6e..8ff38b5bd519 100644 --- a/src/ceph-volume/ceph_volume/log.py +++ b/src/ceph-volume/ceph_volume/log.py @@ -1,6 +1,7 @@ import logging import os -from ceph_volume import config, terminal +from ceph_volume import terminal +from ceph_volume import conf BASE_FORMAT = "[%(name)s][%(levelname)-6s] %(message)s" FILE_FORMAT = "[%(asctime)s]" + BASE_FORMAT @@ -15,19 +16,19 @@ def setup(name='ceph-volume.log'): # The default path is where all ceph log files are, and will get rotated by # Ceph's logrotate rules. default_log_path = os.environ.get('CEPH_VOLUME_LOG_PATH', '/var/log/ceph/') - log_path = config.get('--log-path', default_log_path) + log_path = conf.ceph_volume.get('--log-path', default_log_path) log_file = os.path.join(log_path, 'ceph-volume.log') root_logger.setLevel(logging.DEBUG) # File Logger - config['log_path'] = log_file + conf.ceph_volume['log_path'] = log_file try: fh = logging.FileHandler(log_file) except (OSError, IOError) as err: terminal.warning("Falling back to /tmp/ for logging. Can't use %s" % log_file) terminal.warning(str(err)) - config['log_path'] = tmp_log_file + conf.ceph_volume['log_path'] = tmp_log_file fh = logging.FileHandler(tmp_log_file) fh.setLevel(logging.DEBUG) -- 2.47.3