diff --git a/include/snipplib/utils/snplib_logger.h b/include/snipplib/utils/snplib_logger.h index a47a29c..9e0d01c 100644 --- a/include/snipplib/utils/snplib_logger.h +++ b/include/snipplib/utils/snplib_logger.h @@ -3,6 +3,7 @@ #include #ifdef SNPLIB_SPDLOGGER #include +#include #include #include #endif @@ -93,14 +94,16 @@ public: static std::shared_ptr makeLoggerFromMark(std::string const& mark, std::string const& name) { - if (mark == STDOUT_LOGGER_MARK) { - return std::make_shared(name); + if (mark.empty()) { + return spdlog::null_logger_mt(name); + } else if (mark == STDOUT_LOGGER_MARK) { + return spdlog::stdout_logger_mt(name); } else if (mark == STDERR_LOGGER_MARK) { - return std::make_shared(name); + return spdlog::stderr_logger_mt(name); } else if (mark == NULL_LOGGER_MARK) { - return std::make_shared(name); + return spdlog::null_logger_mt(name); } else { // 'mark' is filename here - return std::make_shared(name, mark); + return spdlog::basic_logger_mt(name, mark); } } @@ -111,7 +114,7 @@ public: static snplib_spdlog_logger_t makeConsoleLogger(std::string const& logger_name, R const& pattern_range = LOGGER_DEFAULT_FORMAT) { - return snplib_spdlog_logger_t(std::make_shared(logger_name), pattern_range); + return snplib_spdlog_logger_t(spdlog::stdout_logger_mt(logger_name), pattern_range); } template @@ -119,7 +122,7 @@ public: static snplib_spdlog_logger_t makeConsoleErrLogger(std::string const& logger_name, R const& pattern_range = LOGGER_DEFAULT_FORMAT) { - return snplib_spdlog_logger_t(std::make_shared(logger_name), pattern_range); + return snplib_spdlog_logger_t(spdlog::stderr_logger_mt(logger_name), pattern_range); } @@ -127,7 +130,7 @@ public: requires snplib_input_char_range_c> static snplib_spdlog_logger_t makeNullLogger(std::string const& logger_name) { - return snplib_spdlog_logger_t(std::make_shared(logger_name)); + return snplib_spdlog_logger_t(spdlog::null_logger_mt(logger_name)); }