From c235e6d9cdb2f1cda74dee0e9140457ee9827493 Mon Sep 17 00:00:00 2001 From: heck Date: Tue, 22 Feb 2022 22:33:38 +0100 Subject: [PATCH] Fix: pEpLog - streams compat --- src/pEpLog.cc | 4 +-- src/pEpLog.hh | 67 ++++++++++++++++++++++----------------------------- 2 files changed, 31 insertions(+), 40 deletions(-) diff --git a/src/pEpLog.cc b/src/pEpLog.cc index f283b6b..c70b717 100644 --- a/src/pEpLog.cc +++ b/src/pEpLog.cc @@ -58,12 +58,12 @@ namespace pEp { void logH2(const string& msg, Utils::Color col) { - log( "\n" +decorate_centered(msg, '='), col); + log("\n" + decorate_centered(msg, '='), col); } void logH3(const string& msg, Utils::Color col) { - log( decorate_centered(msg, '-'), col); + log(decorate_centered(msg, '-'), col); } string decorate_three_lines(const string& msg, char decoration) diff --git a/src/pEpLog.hh b/src/pEpLog.hh index 7ecf2fc..8a2083b 100644 --- a/src/pEpLog.hh +++ b/src/pEpLog.hh @@ -62,82 +62,73 @@ } while (0) #endif // NDEBUG -// pEpLogH1 - logformat "Thread - __FILE__::__FUNTION__ - <=============== message ==============>" -#ifdef NDEBUG - #define pEpLogH1(msg) \ - do { \ - } while (0) -#else - #define pEpLogH1(msg) \ - do { \ - if (pEp::Adapter::pEpLog::get_enabled()) { \ - std::stringstream msg_; \ - msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ - msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ - msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \ - pEp::Adapter::pEpLog::log(msg_.str()); \ - } \ - } while (0) -#endif // NDEBUG -// pEpLogH1 - logformat "Thread - __FILE__::__FUNTION__ - <--------------- message -------------->" +// RAW == without prefix of thread, file, function +// pEpLogRaw - logformat "" #ifdef NDEBUG - #define pEpLogH2(msg) \ + #define pEpLogRaw(msg) \ do { \ } while (0) #else - #define pEpLogH2(msg) \ + #define pEpLogRaw(msg) \ do { \ if (pEp::Adapter::pEpLog::get_enabled()) { \ - std::stringstream msg_; \ - msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ - msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ - msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \ - pEp::Adapter::pEpLog::log(msg_.str()); \ + std::stringstream ss_msg{}; \ + ss_msg << msg; \ + pEp::Adapter::pEpLog::log(ss_msg.str()); \ } \ } while (0) #endif // NDEBUG -// RAW == without prefix of thread, file, function -// pEpLogRaw - logformat "" +// pEpLogH1 - logformat "<==============================>" +// pEpLogH1 - logformat message" +// pEpLogH1 - logformat "<==============================>" #ifdef NDEBUG - #define pEpLogRaw(msg) \ + #define pEpLogH1(msg) \ do { \ } while (0) #else - #define pEpLogRaw(msg) \ + #define pEpLogH1(msg) \ do { \ if (pEp::Adapter::pEpLog::get_enabled()) { \ - pEp::Adapter::pEpLog::log(msg_.str()); \ + std::stringstream ss_msg{}; \ + ss_msg << msg; \ + pEp::Adapter::pEpLog::logH1(ss_msg.str()); \ } \ } while (0) #endif // NDEBUG -// pEpLogRawH1 - logformat "<--------------- message -------------->" + +// pEpLogH2 - logformat <=============== message ==============>" #ifdef NDEBUG - #define pEpLogRawH1(msg) \ + #define pEpLogH2(msg) \ do { \ } while (0) #else - #define pEpLogRawH1(msg) \ + #define pEpLogH2(msg) \ do { \ if (pEp::Adapter::pEpLog::get_enabled()) { \ - pEp::Adapter::pEpLog::logH1(msg_.str()); \ + std::stringstream ss_msg{}; \ + ss_msg << msg; \ + pEp::Adapter::pEpLog::logH2(ss_msg.str()); \ } \ } while (0) #endif // NDEBUG -// pEpLogRawH2 - logformat <=============== message ==============>" + +// pEpLogH2 - logformat <---------------- message ----------------" #ifdef NDEBUG - #define pEpLogRawH2(msg) \ + #define pEpLogH3(msg) \ do { \ } while (0) #else - #define pEpLogRawH2(msg) \ + #define pEpLogH3(msg) \ do { \ if (pEp::Adapter::pEpLog::get_enabled()) { \ - pEp::Adapter::pEpLog::logH2(msg_.str()); \ + std::stringstream ss_msg{}; \ + ss_msg << msg; \ + pEp::Adapter::pEpLog::logH3(ss_msg.str()); \ } \ } while (0) #endif // NDEBUG