Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix severity level of gzlog #635

Merged
merged 2 commits into from
Sep 6, 2024
Merged

Fix severity level of gzlog #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd01d25
Fix severity level of gzlog
azeey Sep 5, 2024
0bd8483
Add flush call to fix gzlog tests
azeey Sep 6, 2024
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
1 change: 1 addition & 0 deletions graphics/src/ColladaLoader_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/gz/common/Console.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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( \
Expand Down
4 changes: 4 additions & 0 deletions src/Console_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Loading