danny
/
spdlog
mirror of https://github.com/gabime/spdlog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge f845f3f0cc into f1a60eb6b1

Browse Source
pull/753/merge
YuhaoChen 7 years ago committed by GitHub
parent f1a60eb6b1 f845f3f0cc
commit bdee4e90fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File

4
include/spdlog/common.h
Unescape Escape View File

@ -176,13 +176,13 @@ using filename_t = std::wstring;
using filename_t = std::string; using filename_t = std::string;
#endif #endif
#define SPDLOG_CATCH_AND_HANDLE \ #define SPDLOG_CATCH_AND_HANDLE(_name) \
catch (const std::exception &ex) \ catch (const std::exception &ex) \
{ \ { \
_err_handler(ex.what()); \ _err_handler(ex.what()); \
} \ } \
catch (...) \ catch (...) \
{ \ { \
_err_handler("Unknown exeption in logger"); \ _err_handler("Unknown exeption in logger" + _name); \
} }
} // namespace spdlog } // namespace spdlog

6
include/spdlog/details/async_log_helper.h
Unescape Escape View File

@ -240,7 +240,7 @@ inline void spdlog::details::async_log_helper::worker_loop()
{ {
active = process_next_msg(); active = process_next_msg();
} }
SPDLOG_CATCH_AND_HANDLE SPDLOG_CATCH_AND_HANDLE(_logger_name)
} }
if (_worker_teardown_cb) if (_worker_teardown_cb)
{ {
@ -282,7 +282,7 @@ inline bool spdlog::details::async_log_helper::process_next_msg()
{ {
s->log(incoming_log_msg); s->log(incoming_log_msg);
} }
SPDLOG_CATCH_AND_HANDLE SPDLOG_CATCH_AND_HANDLE(_logger_name)
} }
} }
handle_flush_interval(); handle_flush_interval();
@ -327,7 +327,7 @@ inline void spdlog::details::async_log_helper::flush_sinks()
{ {
s->flush(); s->flush();
} }
SPDLOG_CATCH_AND_HANDLE SPDLOG_CATCH_AND_HANDLE(_logger_name)
} }
_last_flush = os::now(); _last_flush = os::now();
} }

10
include/spdlog/details/async_logger_impl.h
Unescape Escape View File

@ -83,13 +83,5 @@ inline void spdlog::async_logger::_sink_it(details::log_msg &msg)
_async_log_helper->flush(); // do async flush _async_log_helper->flush(); // do async flush
} }
} }
catch (const std::exception &ex) SPDLOG_CATCH_AND_HANDLE(_name)
{
_err_handler(ex.what());
}
catch (...)
{
_err_handler("Unknown exception in logger " + _name);
throw;
}
} }

8
include/spdlog/details/logger_impl.h
Unescape Escape View File

@ -68,7 +68,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const char *fmt, const Ar
#endif #endif
_sink_it(log_msg); _sink_it(log_msg);
} }
SPDLOG_CATCH_AND_HANDLE SPDLOG_CATCH_AND_HANDLE(_name)
} }
template<typename... Args> template<typename... Args>
@ -84,7 +84,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const char *msg)
log_msg.raw << msg; log_msg.raw << msg;
_sink_it(log_msg); _sink_it(log_msg);
} }
SPDLOG_CATCH_AND_HANDLE SPDLOG_CATCH_AND_HANDLE(_name)
} }
template<typename T> template<typename T>
@ -100,7 +100,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const T &msg)
log_msg.raw << msg; log_msg.raw << msg;
_sink_it(log_msg); _sink_it(log_msg);
} }
SPDLOG_CATCH_AND_HANDLE SPDLOG_CATCH_AND_HANDLE(_name)
} }
template<typename Arg1, typename... Args> template<typename Arg1, typename... Args>
@ -314,7 +314,7 @@ inline void spdlog::logger::flush()
sink->flush(); sink->flush();
} }
} }
SPDLOG_CATCH_AND_HANDLE SPDLOG_CATCH_AND_HANDLE(_name)
} }
inline void spdlog::logger::_default_err_handler(const std::string &msg) inline void spdlog::logger::_default_err_handler(const std::string &msg)

Write Preview
Loading…
Cancel
Save