Admin console log levels.

Now chosen log level is propagated to forkit and kits.
Also, admin console users can filter logs according to their channel names on client side.

Change-Id: Ife15a6148ed87533b81e9d63da252c633e74e559
Signed-off-by: Gökay Şatır <gokaysatir@collabora.com>

1 files changed, 14 insertions, 22 deletions

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 6c07f4918c..3cc0728042 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -603,42 +603,34 @@ unsigned Admin::getNetStatsInterval()
 
 std::string Admin::getChannelLogLevels()
 {
-    std::string result;
-    // Get the list of channels..
-    std::vector<std::string> nameList;
-    Log::logger().names(nameList);
-
     std::string levelList[9] = {"none", "fatal", "critical", "error", "warning", "notice", "information", "debug", "trace"};
+    unsigned int wsdLogLevel = Log::logger().get("wsd").getLevel();
+	std::string result = "wsd=" + levelList[wsdLogLevel];
 
-    for (size_t i = 0; i < nameList.size(); i++)
-    {
-        result += (nameList[i] != "" ? nameList[i]: "?") + '=' + levelList[Log::logger().get(nameList[i]).getLevel()] + (i != nameList.size() - 1 ? " ": "");
-    }
+    result += " kits=" + (_forkitLogLevel != "" ? _forkitLogLevel: levelList[wsdLogLevel]);
 
     return result;
 }
 
-void Admin::setChannelLogLevel(const std::string& _channelName, std::string _level)
+void Admin::setChannelLogLevel(const std::string& _channelName, std::string level)
 {
     assertCorrectThread();
 
-    std::string levelList[9] = {"none", "fatal", "critical", "error", "warning", "notice", "information", "debug", "trace"};
-    if (std::find(std::begin(levelList), std::end(levelList), _level) == std::end(levelList))
-    {
-        _level = "trace";
-    }
-
     // Get the list of channels..
     std::vector<std::string> nameList;
     Log::logger().names(nameList);
 
-    for (size_t i = 0; i < nameList.size(); i++)
+    std::string levelList[9] = {"none", "fatal", "critical", "error", "warning", "notice", "information", "debug", "trace"};
+    if (std::find(std::begin(levelList), std::end(levelList), level) == std::end(levelList))
+        level = "trace";
+
+    if (_channelName == "wsd")
+        Log::logger().get("wsd").setLevel(level);
+    else if (_channelName == "kits")
     {
-        if (nameList[i] == _channelName)
-        {
-            Log::logger().get(nameList[i]).setLevel(_level);
-            break;
-        }
+        LOOLWSD::setLogLevelsOfKits(level); // For current kits.
+		LOOLWSD::sendMessageToForKit("setloglevel " + level); // For forkit and future kits.
+		_forkitLogLevel = level; // We will remember this setting rather than asking forkit its loglevel.
     }
 }