From 9ff0aaac9cc969c7d4224ce4723f1a8077c854a9 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Mon, 27 Apr 2020 21:21:01 +0300
Subject: [PATCH 1/2] Add example of logger.levels usage into config.xml

---
 programs/server/config.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/programs/server/config.xml b/programs/server/config.xml
index 94a2a04e8db..ac62399786b 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -11,7 +11,18 @@
         <size>1000M</size>
         <count>10</count>
         <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
+
+        <!-- Per level overrides:
+
+        For example to suppress logging of the ConfigReloader you can use:
+        -->
+        <!--
+        <levels>
+          <ConfigReloader>none</ConfigReloader>
+        </levels>
+        -->
     </logger>
+
     <!--display_name>production</display_name--> <!-- It is the name that will be shown in the client -->
     <http_port>8123</http_port>
     <tcp_port>9000</tcp_port>

From f7673095743f5e912f10d48c078cb017186e69a4 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Mon, 27 Apr 2020 21:21:01 +0300
Subject: [PATCH 2/2] Ability to set logger level for loggers that have non
 allowed in xml tags symbols

---
 base/loggers/Loggers.cpp   | 27 ++++++++++++++++++++++-----
 programs/server/config.xml | 21 ++++++++++++++++++++-
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/base/loggers/Loggers.cpp b/base/loggers/Loggers.cpp
index d5fd4e4e142..ed806741895 100644
--- a/base/loggers/Loggers.cpp
+++ b/base/loggers/Loggers.cpp
@@ -166,12 +166,29 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
     logger.root().setChannel(logger.getChannel());
 
     // Explicitly specified log levels for specific loggers.
-    Poco::Util::AbstractConfiguration::Keys levels;
-    config.keys("logger.levels", levels);
+    {
+        Poco::Util::AbstractConfiguration::Keys loggers_level;
+        config.keys("logger.levels", loggers_level);
 
-    if (!levels.empty())
-        for (const auto & level : levels)
-            logger.root().get(level).setLevel(config.getString("logger.levels." + level, "trace"));
+        if (!loggers_level.empty())
+        {
+            for (const auto & key : loggers_level)
+            {
+                if (key == "logger" || key.starts_with("logger["))
+                {
+                    const std::string name(config.getString("logger.levels." + key + ".name"));
+                    const std::string level(config.getString("logger.levels." + key + ".level"));
+                    logger.root().get(name).setLevel(level);
+                }
+                else
+                {
+                    // Legacy syntax
+                    const std::string level(config.getString("logger.levels." + key, "trace"));
+                    logger.root().get(key).setLevel(level);
+                }
+            }
+        }
+    }
 }
 
 void Loggers::closeLogs(Poco::Logger & logger)
diff --git a/programs/server/config.xml b/programs/server/config.xml
index ac62399786b..2162088f1c6 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -12,15 +12,34 @@
         <count>10</count>
         <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
 
-        <!-- Per level overrides:
+        <!-- Per level overrides (legacy):
 
         For example to suppress logging of the ConfigReloader you can use:
+        NOTE: levels.logger is reserved, see below.
         -->
         <!--
         <levels>
           <ConfigReloader>none</ConfigReloader>
         </levels>
         -->
+
+        <!-- Per level overrides:
+
+        For example to suppress logging of the RBAC for default user you can use:
+        (But please note that the logger name maybe changed from version to version, even after minor upgrade)
+        -->
+        <!--
+        <levels>
+          <logger>
+            <name>ContextAccess (default)</name>
+            <level>none</level>
+          </logger>
+          <logger>
+            <name>DatabaseOrdinary (test)</name>
+            <level>none</level>
+          </logger>
+        </levels>
+        -->
     </logger>
 
     <!--display_name>production</display_name--> <!-- It is the name that will be shown in the client -->