pEp.foundation
/
libpEpAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix: pEpLog - streams compat

pull/15/head
heck 3 years ago
parent
816972b803
commit
c235e6d9cd
2 changed files with 31 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/pEpLog.cc
  2. 67
      src/pEpLog.hh

4
src/pEpLog.cc
View File

@ -58,12 +58,12 @@ namespace pEp {
void logH2(const string& msg, Utils::Color col) 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) 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) string decorate_three_lines(const string& msg, char decoration)

67
src/pEpLog.hh
View File

@ -62,82 +62,73 @@
} while (0) } while (0)
#endif // NDEBUG #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 "<message>"
#ifdef NDEBUG #ifdef NDEBUG
#define pEpLogH2(msg) \ #define pEpLogRaw(msg) \
do { \ do { \
} while (0) } while (0)
#else #else
#define pEpLogH2(msg) \ #define pEpLogRaw(msg) \
do { \ do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \ if (pEp::Adapter::pEpLog::get_enabled()) { \
std::stringstream msg_; \ std::stringstream ss_msg{}; \
msg_ << "[" << getpid() << " " << std::this_thread::get_id() << "]"; \ ss_msg << msg; \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \ pEp::Adapter::pEpLog::log(ss_msg.str()); \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \
} \ } \
} while (0) } while (0)
#endif // NDEBUG #endif // NDEBUG
// RAW == without prefix of thread, file, function // pEpLogH1 - logformat "<==============================>"
// pEpLogRaw - logformat "<message>" // pEpLogH1 - logformat message"
// pEpLogH1 - logformat "<==============================>"
#ifdef NDEBUG #ifdef NDEBUG
#define pEpLogRaw(msg) \ #define pEpLogH1(msg) \
do { \ do { \
} while (0) } while (0)
#else #else
#define pEpLogRaw(msg) \ #define pEpLogH1(msg) \
do { \ do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \ 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) } while (0)
#endif // NDEBUG #endif // NDEBUG
// pEpLogRawH1 - logformat "<--------------- message -------------->"
// pEpLogH2 - logformat <=============== message ==============>"
#ifdef NDEBUG #ifdef NDEBUG
#define pEpLogRawH1(msg) \ #define pEpLogH2(msg) \
do { \ do { \
} while (0) } while (0)
#else #else
#define pEpLogRawH1(msg) \ #define pEpLogH2(msg) \
do { \ do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \ 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) } while (0)
#endif // NDEBUG #endif // NDEBUG
// pEpLogRawH2 - logformat <=============== message ==============>"
// pEpLogH2 - logformat <---------------- message ----------------"
#ifdef NDEBUG #ifdef NDEBUG
#define pEpLogRawH2(msg) \ #define pEpLogH3(msg) \
do { \ do { \
} while (0) } while (0)
#else #else
#define pEpLogRawH2(msg) \ #define pEpLogH3(msg) \
do { \ do { \
if (pEp::Adapter::pEpLog::get_enabled()) { \ 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) } while (0)
#endif // NDEBUG #endif // NDEBUG

Write Preview
Loading…
Cancel
Save