outman/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable MDC if SPDLOG_NO_TLS is defined

Browse Source
This commit is contained in:
GaryOderNichts 2024-09-12 02:46:34 +02:00
parent 2169a6f6ae
commit bbd3d7ffe2
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/spdlog/mdc.h
View File

@ -8,6 +8,10 @@
#include <spdlog/common.h> #include <spdlog/common.h>
#ifdef SPDLOG_NO_TLS
#error MDC is not supported with SPDLOG_NO_TLS.
#endif
// MDC is a simple map of key->string values stored in thread local storage whose content will be printed by the loggers. // MDC is a simple map of key->string values stored in thread local storage whose content will be printed by the loggers.
// Note: Not supported in async mode (thread local storage - so the async thread pool have different copy). // Note: Not supported in async mode (thread local storage - so the async thread pool have different copy).
// //

14
include/spdlog/pattern_formatter-inl.h
View File

@ -10,10 +10,13 @@
#include <spdlog/details/fmt_helper.h> #include <spdlog/details/fmt_helper.h>
#include <spdlog/details/log_msg.h> #include <spdlog/details/log_msg.h>
#include <spdlog/details/os.h> #include <spdlog/details/os.h>
#include <spdlog/mdc.h>
#include <spdlog/fmt/fmt.h> #include <spdlog/fmt/fmt.h>
#include <spdlog/formatter.h> #include <spdlog/formatter.h>
#ifndef SPDLOG_NO_TLS
#include <spdlog/mdc.h>
#endif
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <cctype> #include <cctype>
@ -784,6 +787,7 @@ private:
log_clock::time_point last_message_time_; log_clock::time_point last_message_time_;
}; };
#ifndef SPDLOG_NO_TLS
// Class for formatting Mapped Diagnostic Context (MDC) in log messages. // Class for formatting Mapped Diagnostic Context (MDC) in log messages.
// Example: [logger-name] [info] [mdc_key_1:mdc_value_1 mdc_key_2:mdc_value_2] some message // Example: [logger-name] [info] [mdc_key_1:mdc_value_1 mdc_key_2:mdc_value_2] some message
template <typename ScopedPadder> template <typename ScopedPadder>
@ -824,6 +828,7 @@ public:
} }
} }
}; };
#endif
// Full info formatter // Full info formatter
// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v // pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] [%s:%#] %v
@ -901,6 +906,7 @@ public:
dest.push_back(' '); dest.push_back(' ');
} }
#ifndef SPDLOG_NO_TLS
// add mdc if present // add mdc if present
auto &mdc_map = mdc::get_context(); auto &mdc_map = mdc::get_context();
if (!mdc_map.empty()) { if (!mdc_map.empty()) {
@ -909,6 +915,8 @@ public:
dest.push_back(']'); dest.push_back(']');
dest.push_back(' '); dest.push_back(' ');
} }
#endif
// fmt_helper::append_string_view(msg.msg(), dest); // fmt_helper::append_string_view(msg.msg(), dest);
fmt_helper::append_string_view(msg.payload, dest); fmt_helper::append_string_view(msg.payload, dest);
} }
@ -916,7 +924,9 @@ public:
private: private:
std::chrono::seconds cache_timestamp_{0}; std::chrono::seconds cache_timestamp_{0};
memory_buf_t cached_datetime_; memory_buf_t cached_datetime_;
#ifndef SPDLOG_NO_TLS
mdc_formatter<null_scoped_padder> mdc_formatter_{padding_info{}}; mdc_formatter<null_scoped_padder> mdc_formatter_{padding_info{}};
#endif
}; };
} // namespace details } // namespace details
@ -1211,9 +1221,11 @@ SPDLOG_INLINE void pattern_formatter::handle_flag_(char flag, details::padding_i
padding)); padding));
break; break;
#ifndef SPDLOG_NO_TLS
case ('&'): case ('&'):
formatters_.push_back(details::make_unique<details::mdc_formatter<Padder>>(padding)); formatters_.push_back(details::make_unique<details::mdc_formatter<Padder>>(padding));
break; break;
#endif
default: // Unknown flag appears as is default: // Unknown flag appears as is
auto unknown_flag = details::make_unique<details::aggregate_formatter>(); auto unknown_flag = details::make_unique<details::aggregate_formatter>();