Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/telnet/TelnetServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,11 @@ bool TelnetMessageCallback(const SP_TelnetSession &session, const std::string &l
return true;
case constHasher("disable log"):
session->sendLine("Default log mode enabled");
#ifdef NDEBUG
spdlog::set_level(spdlog::level::warn);
#else
spdlog::set_level(spdlog::level::info);
#endif
return true;
case constHasher("disable log all"): // Internal use only
session->sendLine("Disabling all logs");
Expand Down
8 changes: 8 additions & 0 deletions src/zeromq/ZeroMQServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ bool ZeroMQServerMessageCallback(const std::vector<zmq::message_t> &recvMsgs, st
{
spdlog::set_level(spdlog::level::trace);
}
if (receivedMsg == "r")
{
#ifdef NDEBUG
spdlog::set_level(spdlog::level::warn);
#else
spdlog::set_level(spdlog::level::info);
#endif
}
reply = ZMQ_EVENT_HANDSHAKE_SUCCEEDED;
break;
}
Expand Down
2 changes: 2 additions & 0 deletions tests/unittests/ZeroMQ_UnitTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ TEST(ZeroMQ_Tests, ZeroMQServerUnitTests)
msgArray.push_back(makeMessageVector(CMD_LOG_LEVEL, "vv"));
// Ask log level (trace - "vvv")
msgArray.push_back(makeMessageVector(CMD_LOG_LEVEL, "vvv"));
// Ask log level (reset - "r")
msgArray.push_back(makeMessageVector(CMD_LOG_LEVEL, "r"));
// Ask log level (fail - extra data)
msgArray.push_back(makeMessageVector(CMD_LOG_LEVEL, "v", "dummy"));
// Ask ping (success)
Expand Down
Loading