some err handler cleanup

This commit is contained in:
gabime 2019-04-05 23:40:27 +03:00
parent 2aceb13f3e
commit bfbb4e4050
2 changed files with 4 additions and 3 deletions

View File

@ -32,6 +32,7 @@ namespace spdlog {
class logger class logger
{ {
public: public:
using err_handler = void (*)(const std::string &msg);
template<typename It> template<typename It>
logger(std::string name, It begin, It end) logger(std::string name, It begin, It end)
: name_(std::move(name)) : name_(std::move(name))
@ -318,7 +319,7 @@ public:
std::vector<sink_ptr> &sinks(); std::vector<sink_ptr> &sinks();
// error handler // error handler
void set_error_handler(void (*handler)(const std::string& msg)); void set_error_handler(err_handler);
// create new logger with same sinks and configuration. // create new logger with same sinks and configuration.
virtual std::shared_ptr<logger> clone(std::string logger_name); virtual std::shared_ptr<logger> clone(std::string logger_name);
@ -340,7 +341,7 @@ public:
std::vector<sink_ptr> sinks_; std::vector<sink_ptr> sinks_;
spdlog::level_t level_{spdlog::logger::default_level()}; spdlog::level_t level_{spdlog::logger::default_level()};
spdlog::level_t flush_level_{level::off}; spdlog::level_t flush_level_{level::off};
void (*custom_err_handler_)(const std::string &msg) {nullptr}; err_handler custom_err_handler_{nullptr};
}; };

View File

@ -113,7 +113,7 @@ SPDLOG_INLINE std::vector<spdlog::sink_ptr> &spdlog::logger::sinks()
} }
// error handler // error handler
SPDLOG_INLINE void spdlog::logger::set_error_handler(void (*handler)(const std::string &msg)) SPDLOG_INLINE void spdlog::logger::set_error_handler(err_handler handler)
{ {
custom_err_handler_ = handler; custom_err_handler_ = handler;
} }