Merge pull request #26 from syyyr/fix-msg-handler-overwrite

Move messageHandler out of globalOptions
fvacek · Jun 25, 2024 · d38b4d5 · d38b4d5
2 parents a5e1a72 + 19dc99f
commit d38b4d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/libnecrolog/necrolog.cpp b/libnecrolog/necrolog.cpp
@@ -12,6 +12,10 @@
 #include <unistd.h>
 #endif
 
+namespace {
+NecroLog::MessageHandler messageHandler = NecroLog::defaultMessageHandler; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+}
+
 NecroLog::Options &NecroLog::globalOptions()
 {
 	static Options global_options;
@@ -101,7 +105,7 @@ bool NecroLog::shouldLog(Level level, const LogContext &context)
 
 NecroLog::MessageHandler NecroLog::setMessageHandler(NecroLog::MessageHandler h)
 {
-	return std::exchange(globalOptions().messageHandler, h);
+	return std::exchange(messageHandler, h);
 }
 
 namespace {
@@ -327,9 +331,8 @@ NecroLog::NecroLogSharedData::NecroLogSharedData(NecroLog::Level level, const Ne
 
 NecroLog::NecroLogSharedData::~NecroLogSharedData()
 {
-	auto h = globalOptions().messageHandler;
-	if(h)
-		h(m_level, m_logContext, m_os.str());
+	if(messageHandler)
+		messageHandler(m_level, m_logContext, m_os.str());
 }
 
 int NecroLog::moduleNameStart(const char *file_name)

diff --git a/libnecrolog/necrolog.h b/libnecrolog/necrolog.h
@@ -92,7 +92,6 @@ class NECROLOG_DECL_EXPORT NecroLog
 		bool logLongFileNames = false;
 		bool caseInsensitiveTopicMatch = false;
 		ColorizedOutputMode colorizedOutput = ColorizedOutputMode::IfTty;
-		MessageHandler messageHandler = defaultMessageHandler;
 	};
 
 	static Options& globalOptions();