From 080c257b1c872577d4297f47de25f9e931d17d53 Mon Sep 17 00:00:00 2001 From: qicosmos Date: Mon, 4 Sep 2023 14:14:01 +0800 Subject: [PATCH 1/3] treat the same with WARN/WARNING and CRITICAL/FATAL --- include/ylt/easylog.hpp | 19 ++++++++++++++----- include/ylt/easylog/appender.hpp | 4 ++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/include/ylt/easylog.hpp b/include/ylt/easylog.hpp index e776d7534..45164f0a1 100644 --- a/include/ylt/easylog.hpp +++ b/include/ylt/easylog.hpp @@ -52,7 +52,8 @@ class logger { append_format(record); } - if (record.get_severity() == Severity::CRITICAL) { + if (record.get_severity() == Severity::CRITICAL || + record.get_severity() == Severity::FATAL) { flush(); std::exit(EXIT_FAILURE); } @@ -213,7 +214,8 @@ inline void add_appender(std::function fn) { easylog::record_t(std::chrono::system_clock::now(), severity, \ GET_STRING(__FILE__, __LINE__)) \ .sprintf(fmt, __VA_ARGS__); \ - if (severity == easylog::Severity::CRITICAL) { \ + if (severity == easylog::Severity::CRITICAL || \ + severity == easylog::Severity::FATAL) { \ easylog::flush(); \ std::exit(EXIT_FAILURE); \ } \ @@ -240,7 +242,8 @@ inline void add_appender(std::function fn) { easylog::record_t(std::chrono::system_clock::now(), severity, \ GET_STRING(__FILE__, __LINE__)) \ .format(prefix::format(format_str, __VA_ARGS__)); \ - if (severity == easylog::Severity::CRITICAL) { \ + if (severity == easylog::Severity::CRITICAL || \ + record.get_severity() == Severity::FATAL) { \ easylog::flush(); \ std::exit(EXIT_FAILURE); \ } \ @@ -285,6 +288,9 @@ inline void add_appender(std::function fn) { #ifndef ELOG_CRITICAL #define ELOG_CRITICAL ELOG(CRITICAL) #endif +#ifndef ELOG_FATAL +#define ELOG_FATAL ELOG(FATAL) +#endif #ifndef MELOG_TRACE #define MELOG_TRACE(id) ELOG(INFO, id) @@ -301,8 +307,8 @@ inline void add_appender(std::function fn) { #ifndef MELOG_ERROR #define MELOG_ERROR(id) ELOG(ERROR, id) #endif -#ifndef MELOG_CRITICAL -#define MELOG_CRITICAL(id) ELOG(CRITICAL, id) +#ifndef MELOG_FATAL +#define MELOG_FATAL(id) ELOG(FATAL, id) #endif #ifndef ELOGT @@ -323,3 +329,6 @@ inline void add_appender(std::function fn) { #ifndef ELOGC #define ELOGC ELOG_CRITICAL #endif +#ifndef ELOGF +#define ELOGF ELOG_FATAL +#endif \ No newline at end of file diff --git a/include/ylt/easylog/appender.hpp b/include/ylt/easylog/appender.hpp index f06efa138..fd8160ad6 100644 --- a/include/ylt/easylog/appender.hpp +++ b/include/ylt/easylog/appender.hpp @@ -242,11 +242,11 @@ class appender { void add_color(Severity severity) { #if defined(_WIN32) - if (severity == Severity::WARN) + if (severity == Severity::WARN || severity == Severity::WARNING) windows_set_color(color_type::black, color_type::yellow); if (severity == Severity::ERROR) windows_set_color(color_type::black, color_type::red); - if (severity == Severity::CRITICAL) + if (severity == Severity::CRITICAL || severity == Severity::FATAL) windows_set_color(color_type::white_bright, color_type::red); #elif __APPLE__ #else From 5aa380e944abfb9dd67729242cc95da561aaa065 Mon Sep 17 00:00:00 2001 From: qicosmos Date: Mon, 4 Sep 2023 14:26:09 +0800 Subject: [PATCH 2/3] remove case --- src/easylog/tests/test_easylog.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/easylog/tests/test_easylog.cpp b/src/easylog/tests/test_easylog.cpp index 6cced83b0..905c29106 100644 --- a/src/easylog/tests/test_easylog.cpp +++ b/src/easylog/tests/test_easylog.cpp @@ -89,7 +89,6 @@ TEST_CASE("test basic") { ELOG(WARN) << "warn"; ELOG(WARNING) << "warning"; - ELOG(FATAL) << "fatal"; ELOG(INFO) << "test log"; easylog::flush(); From 3f39a9ae9dc94ae0fc61871be5553de8615b64f3 Mon Sep 17 00:00:00 2001 From: qicosmos Date: Mon, 4 Sep 2023 14:36:47 +0800 Subject: [PATCH 3/3] compile --- include/ylt/easylog.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ylt/easylog.hpp b/include/ylt/easylog.hpp index 45164f0a1..d93d7dc3f 100644 --- a/include/ylt/easylog.hpp +++ b/include/ylt/easylog.hpp @@ -243,7 +243,7 @@ inline void add_appender(std::function fn) { GET_STRING(__FILE__, __LINE__)) \ .format(prefix::format(format_str, __VA_ARGS__)); \ if (severity == easylog::Severity::CRITICAL || \ - record.get_severity() == Severity::FATAL) { \ + severity == Severity::FATAL) { \ easylog::flush(); \ std::exit(EXIT_FAILURE); \ } \