From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 11 Jul 2017 20:03:02 +0000 (-0400)
Subject: ceph-volume: log: remove log file inferring logic to main
X-Git-Tag: ses5-milestone10~3^2~5^2~63
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0b0bdaef7fea0e7f8d08625e2992f1eaf88c7b96;p=ceph.git

ceph-volume: log: remove log file inferring logic to main

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/src/ceph-volume/ceph_volume/log.py b/src/ceph-volume/ceph_volume/log.py
index 8ff38b5bd519..0e71d26b64e8 100644
--- a/src/ceph-volume/ceph_volume/log.py
+++ b/src/ceph-volume/ceph_volume/log.py
@@ -15,20 +15,15 @@ def setup(name='ceph-volume.log'):
     root_logger = logging.getLogger()
     # 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 = 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
-    conf.ceph_volume['log_path'] = log_file
     try:
-        fh = logging.FileHandler(log_file)
+        fh = logging.FileHandler(conf.log_path)
     except (OSError, IOError) as err:
-        terminal.warning("Falling back to /tmp/ for logging. Can't use %s" % log_file)
+        terminal.warning("Falling back to /tmp/ for logging. Can't use %s" % conf.log_path)
         terminal.warning(str(err))
-        conf.ceph_volume['log_path'] = tmp_log_file
+        conf.log_path = tmp_log_file
         fh = logging.FileHandler(tmp_log_file)
 
     fh.setLevel(logging.DEBUG)