From 0a4a80f51b0a05fd5bc2b31e862f09b83b994b6c Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Fri, 6 Sep 2024 15:59:22 -0500 Subject: [PATCH] Fix severity level of gzlog (#635) The severity level of `gzlog` was incorrectly set to `err`. Changing this to `trace` solves two problems: 1. The log message is now a lot less alarming 2. When running `gz sim -v4`, this message is not shown on the console. It will only be logged to file. It does show up on the console if you run with `-v5`. The second point is technically a behavior change since in Harmonic, regardless of the verbosity level, `gzlog` would never show up on the console. However, duplicating that behavior with the new Console implementation proved to be very complicated. So, I propose we change the meaning of `gzlog` to be equivalent to `gztrace`. Signed-off-by: Addisu Z. Taddese --- graphics/src/ColladaLoader_TEST.cc | 1 + include/gz/common/Console.hh | 2 +- src/Console_TEST.cc | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/graphics/src/ColladaLoader_TEST.cc b/graphics/src/ColladaLoader_TEST.cc index 754f913d..3634b172 100644 --- a/graphics/src/ColladaLoader_TEST.cc +++ b/graphics/src/ColladaLoader_TEST.cc @@ -112,6 +112,7 @@ TEST_F(ColladaLoader, LoadZeroCount) common::testing::TestFile("data", "zero_count.dae")); ASSERT_TRUE(mesh); #ifndef _WIN32 + common::Console::Root().RawLogger().flush(); std::string log = LogContent(); // Expect no errors about missing values diff --git a/include/gz/common/Console.hh b/include/gz/common/Console.hh index a188de20..b20dffec 100644 --- a/include/gz/common/Console.hh +++ b/include/gz/common/Console.hh @@ -77,7 +77,7 @@ namespace gz /// \brief Output a message to a log file. #define gzlog gz::common::LogMessage( \ - __FILE__, __LINE__, spdlog::level::err).stream() + __FILE__, __LINE__, spdlog::level::trace).stream() /// \brief Output a message. #define gzmsg gz::common::LogMessage( \ diff --git a/src/Console_TEST.cc b/src/Console_TEST.cc index 97d65c32..5c31b9ce 100644 --- a/src/Console_TEST.cc +++ b/src/Console_TEST.cc @@ -82,6 +82,7 @@ TEST_F(Console_TEST, NoInitAndLog) // Get the absolute log file path std::string logPath = ".gz/auto_default.log"; + common::Console::Root().RawLogger().flush(); // Expect to find the string in the log file EXPECT_TRUE(GetLogContent(logPath).find(logString) != std::string::npos); @@ -118,6 +119,7 @@ TEST_F(Console_TEST, InitAndLog) // Get the absolute log file path std::string logPath = common::joinPaths(path, "test.log"); + common::Console::Root().RawLogger().flush(); // Expect to find the string in the log file EXPECT_TRUE(GetLogContent(logPath).find(logString) != std::string::npos); @@ -149,6 +151,7 @@ TEST_F(Console_TEST, LogSlashN) gzlog << logString << " _n__ " << i << '\n'; } + common::Console::Root().RawLogger().flush(); std::string logContent = GetLogContent(logPath); for (int i = 0; i < g_messageRepeat; ++i) @@ -179,6 +182,7 @@ TEST_F(Console_TEST, LogStdEndl) gzlog << logString << " endl " << i << std::endl; } + common::Console::Root().RawLogger().flush(); std::string logContent = GetLogContent(logPath); for (int i = 0; i < g_messageRepeat; ++i)