diff options
| author | Gökay Şatır <gokaysatir@collabora.com> | 2020-11-30 11:58:57 +0300 |
|---|---|---|
| committer | Ashod Nakashian <Ashod@users.noreply.github.com> | 2020-12-07 17:30:51 -0500 |
| commit | cdd10066df780c9a882ba20a09be09716a8d0843 (patch) | |
| tree | 2bada755aceeef7f68c065c1def58c4d02f4e881 | |
| parent | Admin console: Cosmetic changes and documentation. (diff) | |
| download | online-cdd10066df780c9a882ba20a09be09716a8d0843.tar.gz online-cdd10066df780c9a882ba20a09be09716a8d0843.zip | |
AdminConsole: Additional changes based on reviews.
Change-Id: I277d9179a84dc34aae9770a07a3a72d35a24a0a6
Signed-off-by: Gökay Şatır <gokaysatir@collabora.com>
| -rw-r--r-- | kit/ForKit.cpp | 2 | ||||
| -rw-r--r-- | wsd/Admin.cpp | 6 | ||||
| -rw-r--r-- | wsd/DocumentBroker.cpp | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp index a16a44adef..35ef20f8e3 100644 --- a/kit/ForKit.cpp +++ b/kit/ForKit.cpp @@ -155,7 +155,7 @@ protected: else if (tokens.size() == 2 && tokens.equals(0, "setloglevel")) { // Set environment variable so that new children will also set their log levels accordingly. - setenv("LOOL_LOGLEVEL", tokens[1].c_str(), true); + setenv("LOOL_LOGLEVEL", tokens[1].c_str(), 1); Log::logger().setLevel(tokens[1]); } else if (tokens.size() == 3 && tokens.equals(0, "setconfig")) diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp index cfca8c6ed0..238d00bfc7 100644 --- a/wsd/Admin.cpp +++ b/wsd/Admin.cpp @@ -606,7 +606,7 @@ std::string Admin::getChannelLogLevels() unsigned int wsdLogLevel = Log::logger().get("wsd").getLevel(); std::string result = "wsd=" + levelList[wsdLogLevel]; - result += " kits=" + (_forkitLogLevel.empty() != true ? _forkitLogLevel: levelList[wsdLogLevel]); + result += " kit=" + (_forkitLogLevel.empty() != true ? _forkitLogLevel: levelList[wsdLogLevel]); return result; } @@ -620,11 +620,11 @@ void Admin::setChannelLogLevel(const std::string& _channelName, std::string leve Log::logger().names(nameList); if (std::find(std::begin(levelList), std::end(levelList), level) == std::end(levelList)) - level = "trace"; + level = "debug"; if (_channelName == "wsd") Log::logger().get("wsd").setLevel(level); - else if (_channelName == "kits") + else if (_channelName == "kit") { LOOLWSD::setLogLevelsOfKits(level); // For current kits. LOOLWSD::sendMessageToForKit("setloglevel " + level); // For forkit and future kits. diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 8450642378..867dc791bb 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -1723,7 +1723,6 @@ void DocumentBroker::alertAllUsers(const std::string& msg) void DocumentBroker::setKitLogLevel(const std::string& level) { assertCorrectThread(); - std::unique_lock<std::mutex> lock(_mutex); _childProcess->sendTextFrame("setloglevel " + level); } |