]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/mgr_module: log to mgr log even when log_to_file
authorSage Weil <sage@redhat.com>
Tue, 25 Feb 2020 18:59:03 +0000 (12:59 -0600)
committerSage Weil <sage@redhat.com>
Thu, 27 Feb 2020 17:54:29 +0000 (11:54 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/mgr_module.py

index 1681e7c998ae3fcd17a8fc7a91c0d8eae61e4812..05fb74df6a811aa2163ce16c1bd57cf84a35222e 100644 (file)
@@ -448,8 +448,6 @@ class MgrModuleLoggingMixin(object):
         self.log_to_file = log_to_file
         if log_to_file:
             self._root_logger.addHandler(self._file_log_handler)
-        else:
-            self._root_logger.addHandler(self._ceph_log_handler)
 
         self._root_logger.setLevel(logging.NOTSET)
         self._set_log_level(mgr_level, module_level)
@@ -492,17 +490,15 @@ class MgrModuleLoggingMixin(object):
         self._file_log_handler.setLevel(level)
 
     def _enable_file_log(self):
-        # disable ceph log and enable file log
+        # enable file log
         self.getLogger().warning("enabling logging to file")
         self.log_to_file = True
         self._root_logger.addHandler(self._file_log_handler)
-        self._root_logger.removeHandler(self._ceph_log_handler)
 
     def _disable_file_log(self):
-        # disable file log and enable ceph log
+        # disable file log
         self.getLogger().warning("disabling logging to file")
         self.log_to_file = False
-        self._root_logger.addHandler(self._ceph_log_handler)
         self._root_logger.removeHandler(self._file_log_handler)
 
     def _ceph_log_level_to_python(self, ceph_log_level):