This commit is contained in:
gabime
2025-01-06 10:35:08 +02:00
parent 7dfb474632
commit ffbb35368d
5 changed files with 73 additions and 66 deletions

View File

@@ -1,8 +1,9 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
#include "iostream"
#include "spdlog/details/err_helper.h"
#include "iostream"
#include "spdlog/details/os.h"
namespace spdlog {
@@ -10,31 +11,35 @@ namespace details {
// Prints error to stderr with source location (if available). A stderr sink is not used because reaching
// this point might indicate a problem with the logging system itself so we use fputs() directly.
void err_helper::handle_ex(const std::string &origin, const source_loc &loc, const std::exception &ex) const {
if (custom_err_handler_) {
custom_err_handler_(ex.what());
return;
void err_helper::handle_ex(const std::string &origin, const source_loc &loc, const std::exception &ex) const noexcept {
try {
if (custom_err_handler_) {
custom_err_handler_(ex.what());
return;
}
const auto tm_time = os::localtime();
char date_buf[32];
std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time);
std::string msg;
if (loc.empty()) {
msg = fmt_lib::format("[*** LOG ERROR ***] [{}] [{}] {}\n", date_buf, origin, ex.what());
} else {
msg = fmt_lib::format("[*** LOG ERROR ***] [{}({})] [{}] [{}] {}\n", loc.filename, loc.line, date_buf, origin,
ex.what());
}
std::fputs(msg.c_str(), stderr);
} catch (const std::exception &handler_ex) {
std::fprintf(stderr, "[*** LOG ERROR ***] [%s] caught exception during error handler: %s\n", origin.c_str(), handler_ex.what());
} catch (...) { // catch all exceptions
std::fprintf(stderr, "[*** LOG ERROR ***] [%s] caught unknown exception during error handler\n", origin.c_str());
}
const auto tm_time = os::localtime();
char date_buf[32];
std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time);
std::string msg;
if (loc.empty()) {
msg = fmt_lib::format("[*** LOG ERROR ***] [{}] [{}] {}\n", date_buf, origin, ex.what());
} else {
msg = fmt_lib::format("[*** LOG ERROR ***] [{}({})] [{}] [{}] {}\n", loc.filename, loc.line, date_buf, origin,
ex.what());
}
std::fputs(msg.c_str(), stderr);
}
void err_helper::handle_unknown_ex(const std::string &origin, const source_loc &loc) const {
void err_helper::handle_unknown_ex(const std::string &origin, const source_loc &loc) const noexcept {
handle_ex(origin, loc, std::runtime_error("unknown exception"));
}
void err_helper::set_err_handler(err_handler handler) {
custom_err_handler_ = std::move(handler);
}
void err_helper::set_err_handler(err_handler handler) { custom_err_handler_ = std::move(handler); }
} // namespace details
} // namespace spdlog

View File

@@ -25,7 +25,7 @@ logger::logger(logger &&other) noexcept
void logger::set_level(level level) { level_.store(level); }
level logger::log_level() const { return level_.load(std::memory_order_relaxed); }
level logger::log_level() const noexcept { return level_.load(std::memory_order_relaxed); }
const std::string &logger::name() const { return name_; }
@@ -48,16 +48,16 @@ void logger::set_pattern(std::string pattern, pattern_time_type time_type) {
}
// flush functions
void logger::flush() { flush_(); }
void logger::flush() noexcept { flush_(); }
void logger::flush_on(level level) { flush_level_.store(level); }
void logger::flush_on(level level) noexcept { flush_level_.store(level); }
level logger::flush_level() const { return flush_level_.load(std::memory_order_relaxed); }
level logger::flush_level() const noexcept { return flush_level_.load(std::memory_order_relaxed); }
// sinks
const std::vector<sink_ptr> &logger::sinks() const { return sinks_; }
const std::vector<sink_ptr> &logger::sinks() const noexcept { return sinks_; }
std::vector<sink_ptr> &logger::sinks() { return sinks_; }
std::vector<sink_ptr> &logger::sinks() noexcept { return sinks_; }
// custom error handler
void logger::set_error_handler(err_handler handler) { err_helper_.set_err_handler(std::move(handler)); }
@@ -70,7 +70,7 @@ std::shared_ptr<logger> logger::clone(std::string logger_name) {
}
// private/protected methods
void logger::flush_() {
void logger::flush_() noexcept{
for (auto &sink : sinks_) {
try {
sink->flush();