From: Ricardo Dias <rdias@suse.com>
Date: Wed, 25 Sep 2019 10:45:38 +0000 (+0100)
Subject: mgr: use modules' log_level instead of mgr log level
X-Git-Tag: v15.1.0~694^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=58a7a6f5e0bf3334b7174c87a162bbc8247be1f9;p=ceph.git

mgr: use modules' log_level instead of mgr log level

Signed-off-by: Ricardo Dias <rdias@suse.com>
---

diff --git a/src/mgr/BaseMgrModule.cc b/src/mgr/BaseMgrModule.cc
index b340f74f1a1f..a6963bb28eb6 100644
--- a/src/mgr/BaseMgrModule.cc
+++ b/src/mgr/BaseMgrModule.cc
@@ -528,15 +528,14 @@ get_daemon_status(BaseMgrModule *self, PyObject *args)
 static PyObject*
 ceph_log(BaseMgrModule *self, PyObject *args)
 {
-  int level = 0;
   char *record = nullptr;
-  if (!PyArg_ParseTuple(args, "is:log", &level, &record)) {
+  if (!PyArg_ParseTuple(args, "s:log", &record)) {
     return nullptr;
   }
 
   ceph_assert(self->this_module);
 
-  self->this_module->log(level, record);
+  self->this_module->log(record);
 
   Py_RETURN_NONE;
 }
diff --git a/src/mgr/BaseMgrStandbyModule.cc b/src/mgr/BaseMgrStandbyModule.cc
index f3fbff667cf6..59f97d8172b9 100644
--- a/src/mgr/BaseMgrStandbyModule.cc
+++ b/src/mgr/BaseMgrStandbyModule.cc
@@ -152,15 +152,14 @@ ceph_get_active_uri(BaseMgrStandbyModule *self, PyObject *args)
 static PyObject*
 ceph_log(BaseMgrStandbyModule *self, PyObject *args)
 {
-  int level = 0;
   char *record = nullptr;
-  if (!PyArg_ParseTuple(args, "is:log", &level, &record)) {
+  if (!PyArg_ParseTuple(args, "s:log", &record)) {
     return nullptr;
   }
 
   ceph_assert(self->this_module);
 
-  self->this_module->log(level, record);
+  self->this_module->log(record);
 
   Py_RETURN_NONE;
 }
diff --git a/src/mgr/PyModuleRunner.cc b/src/mgr/PyModuleRunner.cc
index 403c8a9f183f..ca90f87a1db9 100644
--- a/src/mgr/PyModuleRunner.cc
+++ b/src/mgr/PyModuleRunner.cc
@@ -90,11 +90,11 @@ void PyModuleRunner::shutdown()
   }
 }
 
-void PyModuleRunner::log(int level, const std::string &record)
+void PyModuleRunner::log(const std::string &record)
 {
 #undef dout_prefix
-#define dout_prefix *_dout << "mgr[" << get_name() << "] "
-  dout(ceph::dout::need_dynamic(level)) << record << dendl;
+#define dout_prefix *_dout << "[" << get_name() << "] "
+  dout(0) << record << dendl;
 #undef dout_prefix
 #define dout_prefix *_dout << "mgr " << __func__ << " "
 }
diff --git a/src/mgr/PyModuleRunner.h b/src/mgr/PyModuleRunner.h
index 08c85a132636..4d0b7601928a 100644
--- a/src/mgr/PyModuleRunner.h
+++ b/src/mgr/PyModuleRunner.h
@@ -52,7 +52,7 @@ protected:
 public:
   int serve();
   void shutdown();
-  void log(int level, const std::string &record);
+  void log(const std::string &record);
 
   const char *get_thread_name() const
   {
diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index e2d846692288..12811a14ecfe 100644
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -52,18 +52,11 @@ class CPlusPlusHandler(logging.Handler):
     def __init__(self, module_inst):
         super(CPlusPlusHandler, self).__init__()
         self._module = module_inst
+        self.setFormatter(logging.Formatter("[%(levelname)-4s] %(message)s"))
 
     def emit(self, record):
-        if record.levelno <= logging.DEBUG:
-            ceph_level = 20
-        elif record.levelno <= logging.INFO:
-            ceph_level = 4
-        elif record.levelno <= logging.WARNING:
-            ceph_level = 1
-        else:
-            ceph_level = 0
-
-        self._module._ceph_log(ceph_level, self.format(record))
+        if record.levelno >= self._module._get_log_level():
+            self._module._ceph_log(self.format(record))
 
 
 def configure_logger(module_inst, module_name):
@@ -97,7 +90,7 @@ def configure_logger(module_inst, module_name):
     # Check https://docs.python.org/3/library/logging.html#logging.Logger.setLevel
     # for more information about how the effective log level is
     # determined.
-    root_logger.setLevel(logging.ERROR)
+    root_logger.setLevel(logging.CRITICAL)
 
     return logger