ceph-volume: log: use new config module

Signed-off-by: Alfredo Deza <adeza@redhat.com>
This commit is contained in:
Alfredo Deza 2017-07-06 15:13:35 -04:00
parent 44f5dffc36
commit 357b499582

View File

@ -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)