timur/snipplib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Timur A. Fatkhullin
2026-08-01 11:47:36 +03:00
parent 9d3d7ab2e5
commit ee450ca108
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/snipplib/utils/snplib_logger.h
View File

@@ -3,6 +3,7 @@
#include <list> #include <list>
#ifdef SNPLIB_SPDLOGGER #ifdef SNPLIB_SPDLOGGER
#include <spdlog/logger.h> #include <spdlog/logger.h>
#include <spdlog/sinks/basic_file_sink.h>
#include <spdlog/sinks/null_sink.h> #include <spdlog/sinks/null_sink.h>
#include <spdlog/sinks/stdout_sinks.h> #include <spdlog/sinks/stdout_sinks.h>
#endif #endif
@@ -93,14 +94,16 @@ public:
static std::shared_ptr<spdlog::logger> makeLoggerFromMark(std::string const& mark, std::string const& name) static std::shared_ptr<spdlog::logger> makeLoggerFromMark(std::string const& mark, std::string const& name)
{ {
if (mark == STDOUT_LOGGER_MARK) { if (mark.empty()) {
return std::make_shared<spdlog::stdout_logger_mt>(name); return spdlog::null_logger_mt(name);
} else if (mark == STDOUT_LOGGER_MARK) {
return spdlog::stdout_logger_mt(name);
} else if (mark == STDERR_LOGGER_MARK) { } else if (mark == STDERR_LOGGER_MARK) {
return std::make_shared<spdlog::stderr_logger_mt>(name); return spdlog::stderr_logger_mt(name);
} else if (mark == NULL_LOGGER_MARK) { } else if (mark == NULL_LOGGER_MARK) {
return std::make_shared<spdlog::null_logger_mt>(name); return spdlog::null_logger_mt(name);
} else { // 'mark' is filename here } else { // 'mark' is filename here
return std::make_shared<spdlog::basic_logger_mt>(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, static snplib_spdlog_logger_t makeConsoleLogger(std::string const& logger_name,
R const& pattern_range = LOGGER_DEFAULT_FORMAT) R const& pattern_range = LOGGER_DEFAULT_FORMAT)
{ {
return snplib_spdlog_logger_t(std::make_shared<spdlog::stdout_logger_mt>(logger_name), pattern_range); return snplib_spdlog_logger_t(spdlog::stdout_logger_mt(logger_name), pattern_range);
} }
template <std::ranges::input_range R = decltype(LOGGER_DEFAULT_FORMAT)> template <std::ranges::input_range R = decltype(LOGGER_DEFAULT_FORMAT)>
@@ -119,7 +122,7 @@ public:
static snplib_spdlog_logger_t makeConsoleErrLogger(std::string const& logger_name, static snplib_spdlog_logger_t makeConsoleErrLogger(std::string const& logger_name,
R const& pattern_range = LOGGER_DEFAULT_FORMAT) R const& pattern_range = LOGGER_DEFAULT_FORMAT)
{ {
return snplib_spdlog_logger_t(std::make_shared<spdlog::stderr_logger_mt>(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<std::ranges::range_value_t<R>> requires snplib_input_char_range_c<std::ranges::range_value_t<R>>
static snplib_spdlog_logger_t makeNullLogger(std::string const& logger_name) static snplib_spdlog_logger_t makeNullLogger(std::string const& logger_name)
{ {
return snplib_spdlog_logger_t(std::make_shared<spdlog::null_logger_mt>(logger_name)); return snplib_spdlog_logger_t(spdlog::null_logger_mt(logger_name));
} }