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
5 changes: 5 additions & 0 deletions ZEngine/ZEngine/Logging/Logger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@ namespace ZEngine::Logging

void Logger::Log(LogChannel channel, LogLevel level, std::string_view msg)
{
if (!IsInitialized())
{
return;
}

const int min = k_min_level[static_cast<size_t>(channel)];
if (static_cast<int>(level) < min)
{
Expand Down
20 changes: 20 additions & 0 deletions ZEngine/tests/Logging/Logger_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,18 @@ class LoggerTest : public ::testing::Test
std::string LoggerTest::s_log_dir;
std::string LoggerTest::s_crash_dir;

TEST(LoggerUninitialized, LogBeforeInitializeDoesNotCrash)
{
if (Logger::IsInitialized())
{
Logger::Dispose();
}

EXPECT_FALSE(Logger::IsInitialized());
Logger::Log(LogChannel::ENGINE, LogLevel::WARN, "before initialize");
ZENGINE_CORE_WARN("before initialize via macro");
}

TEST_F(LoggerTest, IsInitializedAfterInit)
{
EXPECT_TRUE(Logger::IsInitialized());
Expand Down Expand Up @@ -319,3 +331,11 @@ TEST_F(LoggerTest, LevelToStringAllValues)
EXPECT_STREQ(Logger::LevelToString(LogLevel::ERR), "error");
EXPECT_STREQ(Logger::LevelToString(LogLevel::CRITICAL), "critical");
}

TEST_F(LoggerTest, LogAfterDisposeDoesNotCrash)
{
Logger::Dispose();
EXPECT_FALSE(Logger::IsInitialized());
Logger::Log(LogChannel::ENGINE, LogLevel::ERR, "after dispose");
ZENGINE_CORE_ERROR("after dispose via macro");
}
Loading