RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 14:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-volume: prevent missing conf values for logging config

Browse Source 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
This commit is contained in:
Alfredo Deza 2017-07-26 14:50:27 -04:00
parent b458646ef1
commit 21ec4cea74
1 changed files with 4 additions and 3 deletions

7
src/ceph-volume/ceph_volume/log.py
View File

@ -7,7 +7,8 @@ BASE_FORMAT = "[%(name)s][%(levelname)-6s] %(message)s"
FILE_FORMAT = "[%(asctime)s]" + BASE_FORMAT
def setup(name='ceph-volume.log'):
def setup(name='ceph-volume.log', log_path=None):
log_path = log_path or conf.log_path
# if a non-root user calls help or other no-sudo-required command the
# logger will fail to write to /var/lib/ceph/ so this /tmp/ path is used as
# a fallback
@ -19,9 +20,9 @@ def setup(name='ceph-volume.log'):
root_logger.setLevel(logging.DEBUG)
try:
fh = logging.FileHandler(conf.log_path)
fh = logging.FileHandler(log_path)
except (OSError, IOError) as err:
terminal.warning("Falling back to /tmp/ for logging. Can't use %s" % conf.log_path)
terminal.warning("Falling back to /tmp/ for logging. Can't use %s" % log_path)
terminal.warning(str(err))
conf.log_path = tmp_log_file
fh = logging.FileHandler(tmp_log_file)