Skip to content

[Refactor]: Use init counter instead of boolean initialized #4

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

Merged
nircoe merged 1 commit into from
Jan 9, 2026
Merged

[Refactor]: Use init counter instead of boolean initialized #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 18 additions & 19 deletions src/logcoe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace
{
class LoggerImpl
{
static bool s_initialized;
static unsigned int s_initCounter;
static LogLevel s_logLevel;
static std::string s_defaultSource;
static std::mutex s_mutex;
Expand Down Expand Up @@ -56,7 +56,7 @@ namespace
static void flush();
};

bool LoggerImpl::s_initialized = false;
unsigned int LoggerImpl::s_initCounter = 0;
LogLevel LoggerImpl::s_logLevel = LogLevel::INFO;
std::string LoggerImpl::s_defaultSource = "";
std::mutex LoggerImpl::s_mutex;
Expand All @@ -69,7 +69,7 @@ namespace

std::string LoggerImpl::getCurrentTimestamp()
{
if(!s_initialized) return "";
if(s_initCounter == 0) return "";

auto now = std::chrono::system_clock::now();
std::time_t time_t_now = std::chrono::system_clock::to_time_t(now);
Expand All @@ -89,7 +89,7 @@ namespace

std::string LoggerImpl::getLogLevelAsString(LogLevel level)
{
if(!s_initialized) return "";
if(s_initCounter == 0) return "";

switch (level)
{
Expand All @@ -108,7 +108,7 @@ namespace

void LoggerImpl::writeToOutputs(const std::string &formattedMessage, LogLevel level, bool flush)
{
if (!s_initialized || static_cast<int>(level) < static_cast<int>(s_logLevel))
if (s_initCounter == 0 || static_cast<int>(level) < static_cast<int>(s_logLevel))
return;

if (s_useConsole && s_consoleStream)
Expand All @@ -129,7 +129,7 @@ namespace
void LoggerImpl::log(LogLevel level, const std::string &message, const std::string &source, bool flush)
{
std::lock_guard<std::mutex> lock(s_mutex);
if(!s_initialized) return;
if(s_initCounter == 0) return;

std::stringstream formattedMessage;
formattedMessage << "[" << getCurrentTimestamp() << "] ";
Expand All @@ -144,10 +144,9 @@ namespace
void LoggerImpl::initialize(LogLevel level, const std::string &defaultSource, bool enableConsole, bool enableFile, const std::string &filename)
{
std::lock_guard<std::mutex> lock(s_mutex);
if(s_initialized)
throw std::runtime_error("[logcoe] logcoe is already initialized, please shutdown before initializing again");
if(s_initCounter++ > 0)
return writeToOutputs("[logcoe] Already initialized, ignoring new configurations");

s_initialized = true;
s_logLevel = level;
s_defaultSource = defaultSource;
s_useConsole = enableConsole;
Expand Down Expand Up @@ -188,7 +187,7 @@ namespace
void LoggerImpl::shutdown()
{
std::lock_guard<std::mutex> lock(s_mutex);
if(!s_initialized) return;
if (--s_initCounter > 0) return;

std::string shutdownMessage = "[logcoe] shutting down";
writeToOutputs(shutdownMessage);
Expand All @@ -202,21 +201,21 @@ namespace
s_useFile = false;
s_logLevel = LogLevel::NONE;
s_filename = "logcoe.log";
s_initialized = false;
s_initCounter = 0;
}

void LoggerImpl::setLogLevel(LogLevel level)
{
std::lock_guard<std::mutex> lock(s_mutex);
if(!s_initialized) return;
if(s_initCounter == 0) return;

s_logLevel = level;
}

void LoggerImpl::setConsoleOutput(std::ostream &stream)
{
std::lock_guard<std::mutex> lock(s_mutex);
if(!s_initialized) return;
if(s_initCounter == 0) return;

if (s_useConsole && s_consoleStream)
s_consoleStream->flush();
Expand All @@ -227,7 +226,7 @@ namespace
bool LoggerImpl::setFileOutput(const std::string &filename)
{
std::lock_guard<std::mutex> lock(s_mutex);
if(!s_initialized) return false;
if(s_initCounter == 0) return false;

if (s_fileStream.is_open())
{
Expand All @@ -252,7 +251,7 @@ namespace
void LoggerImpl::disableConsoleOutput()
{
std::lock_guard<std::mutex> lock(s_mutex);
if(!s_initialized) return;
if(s_initCounter == 0) return;

if (s_useConsole && s_consoleStream)
s_consoleStream->flush();
Expand All @@ -263,7 +262,7 @@ namespace
void LoggerImpl::disableFileOutput()
{
std::lock_guard<std::mutex> lock(s_mutex);
if(!s_initialized) return;
if(s_initCounter == 0) return;

if (s_fileStream.is_open())
{
Expand All @@ -279,7 +278,7 @@ namespace
void LoggerImpl::setTimeFormat(const std::string &format)
{
std::lock_guard<std::mutex> lock(s_mutex);
if(!s_initialized) return;
if(s_initCounter == 0) return;

try
{
Expand Down Expand Up @@ -314,7 +313,7 @@ namespace
{
std::lock_guard<std::mutex> lock(s_mutex);

return s_initialized;
return s_initCounter > 0;
}

LogLevel LoggerImpl::getLogLevel()
Expand Down Expand Up @@ -346,7 +345,7 @@ namespace

void LoggerImpl::flush()
{
if(!s_initialized) return;
if(s_initCounter == 0) return;
if (s_useConsole && s_consoleStream)
s_consoleStream->flush();
if (s_useFile && s_fileStream.is_open())
Expand Down
5 changes: 3 additions & 2 deletions tests/logcoe_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ class LogcoeTest : public ::testing::Test
void SetUp() override
{
testFilename = "test_logfile_" + std::to_string(std::chrono::system_clock::now().time_since_epoch().count()) + ".log";
logcoe::shutdown();

while(logcoe::isInitialized()) { logcoe::shutdown(); }
}

void TearDown() override
{
logcoe::shutdown();
while(logcoe::isInitialized()) { logcoe::shutdown(); }

if (std::filesystem::exists(testFilename))
std::filesystem::remove(testFilename);
Expand Down
4 changes: 2 additions & 2 deletions tests/logcoe_thread_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ class LogcoeThreadTest : public ::testing::Test
{
testFilename = "thread_test_" + std::to_string(std::chrono::system_clock::now().time_since_epoch().count()) + ".log";

logcoe::shutdown();
while(logcoe::isInitialized()) { logcoe::shutdown(); }
}

void TearDown() override
{
logcoe::shutdown();
while(logcoe::isInitialized()) { logcoe::shutdown(); }

if (std::filesystem::exists(testFilename))
std::filesystem::remove(testFilename);
Expand Down
Loading