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

fix/issue-3101: fix the issue of mdc ignores SPDLOG_NO_TLS

Browse Source
This commit is contained in:
dyf 2024-09-11 18:31:45 +08:00
parent 271f0f3b14
commit 7e5c8049ef
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/spdlog/mdc.h
View File

@ -21,25 +21,37 @@ public:
using mdc_map_t = std::map<std::string, std::string>; using mdc_map_t = std::map<std::string, std::string>;
static void put(const std::string &key, const std::string &value) { static void put(const std::string &key, const std::string &value) {
get_context()[key] = value; auto pcontext = get_context();
if (pcontext) { (*pcontext)[key] = value; }
} }
static std::string get(const std::string &key) { static std::string get(const std::string &key) {
auto &context = get_context(); auto pcontext = get_context();
auto it = context.find(key); if (!pcontext) { return ""; }
if (it != context.end()) { auto it = pcontext->find(key);
if (it != pcontext->end()) {
return it->second; return it->second;
} }
return ""; return "";
} }
static void remove(const std::string &key) { get_context().erase(key); } static void remove(const std::string &key) {
auto pcontext = get_context();
if (pcontext) { pcontext->erase(key);}
}
static void clear() { get_context().clear(); } static void clear() {
auto pcontext = get_context();
if (pcontext) { pcontext->clear(); }
}
static mdc_map_t &get_context() { static mdc_map_t *get_context() {
#if defined(SPDLOG_NO_TLS)
return nullptr;
#else
static thread_local mdc_map_t context; static thread_local mdc_map_t context;
return context; return &context;
#endif
} }
}; };

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

@ -793,12 +793,12 @@ public:
: flag_formatter(padinfo) {} : flag_formatter(padinfo) {}
void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override { void format(const details::log_msg &, const std::tm &, memory_buf_t &dest) override {
auto &mdc_map = mdc::get_context(); auto pmdc_map = mdc::get_context();
if (mdc_map.empty()) { if (!pmdc_map || pmdc_map->empty()) {
ScopedPadder p(0, padinfo_, dest); ScopedPadder p(0, padinfo_, dest);
return; return;
} else { } else {
format_mdc(mdc_map, dest); format_mdc(*pmdc_map, dest);
} }
} }
@ -902,10 +902,10 @@ public:
} }
// add mdc if present // add mdc if present
auto &mdc_map = mdc::get_context(); auto pmdc_map = mdc::get_context();
if (!mdc_map.empty()) { if (pmdc_map && !pmdc_map->empty()) {
dest.push_back('['); dest.push_back('[');
mdc_formatter_.format_mdc(mdc_map, dest); mdc_formatter_.format_mdc(*pmdc_map, dest);
dest.push_back(']'); dest.push_back(']');
dest.push_back(' '); dest.push_back(' ');
} }