diff options
| author | Anthony Towns <aj@erisian.com.au> | 2023-08-22 13:59:32 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2023-12-15 11:03:22 +1000 |
| commit | c5c76dc615677d226c9f6b3f2b66d833315d40da (patch) | |
| tree | 6c84a458b2c23e78b59ff9f2d2d7243c20249780 /src/logging.cpp | |
| parent | 8f7b9eb8711fdb32e8bdb59d2a7462a46c7a8086 (diff) | |
| download | bitcoin-c5c76dc615677d226c9f6b3f2b66d833315d40da.tar.xz | |
logging: refactor: pull prefix code out
Diffstat (limited to 'src/logging.cpp')
| -rw-r--r-- | src/logging.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/logging.cpp b/src/logging.cpp index 08bfa1f7a4..c4bd221e04 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -202,7 +202,7 @@ bool GetLogCategory(BCLog::LogFlags& flag, const std::string& str) return false; } -std::string BCLog::Logger::LogLevelToStr(BCLog::Level level) const +std::string BCLog::Logger::LogLevelToStr(BCLog::Level level) { switch (level) { case BCLog::Level::Trace: @@ -341,7 +341,7 @@ static constexpr std::array<BCLog::Level, 3> LogLevelsList() std::string BCLog::Logger::LogLevelsString() const { const auto& levels = LogLevelsList(); - return Join(std::vector<BCLog::Level>{levels.begin(), levels.end()}, ", ", [this](BCLog::Level level) { return LogLevelToStr(level); }); + return Join(std::vector<BCLog::Level>{levels.begin(), levels.end()}, ", ", [](BCLog::Level level) { return LogLevelToStr(level); }); } std::string BCLog::Logger::LogTimestampStr(const std::string& str) @@ -392,12 +392,9 @@ namespace BCLog { } } // namespace BCLog -void BCLog::Logger::LogPrintStr(const std::string& str, const std::string& logging_function, const std::string& source_file, int source_line, BCLog::LogFlags category, BCLog::Level level) +std::string BCLog::Logger::GetLogPrefix(BCLog::LogFlags category, BCLog::Level level) const { - StdLockGuard scoped_lock(m_cs); - std::string str_prefixed = LogEscapeMessage(str); - - if ((category != LogFlags::NONE || level != Level::None) && m_started_new_line) { + if (category != LogFlags::NONE || level != Level::None) { std::string s{"["}; if (category != LogFlags::NONE) { @@ -414,7 +411,18 @@ void BCLog::Logger::LogPrintStr(const std::string& str, const std::string& loggi } s += "] "; - str_prefixed.insert(0, s); + return s; + } + return {}; +} + +void BCLog::Logger::LogPrintStr(const std::string& str, const std::string& logging_function, const std::string& source_file, int source_line, BCLog::LogFlags category, BCLog::Level level) +{ + StdLockGuard scoped_lock(m_cs); + std::string str_prefixed = LogEscapeMessage(str); + + if (m_started_new_line) { + str_prefixed.insert(0, GetLogPrefix(category, level)); } if (m_log_sourcelocations && m_started_new_line) { |