mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-12-26 10:31:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #533 from manuel-schiller/patch-1

Browse Source 
rethrow unwind exception
This commit is contained in:
Gabi Melman 2017-10-25 12:57:40 +03:00 committed by GitHub
commit fbb8244f7d
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/spdlog/common.h
View File

@ -42,6 +42,12 @@
#define SPDLOG_DEPRECATED #define SPDLOG_DEPRECATED
#endif #endif
#ifdef __linux__
#include <cxxabi.h>
#define SPDLOG_CATCH_ALL catch (abi::__forced_unwind&) { _err_handler("Unknown exception"); throw; } catch (...)
#else // __linux__
#define SPDLOG_CATCH_ALL catch (...)
#endif // __linux__
#include "spdlog/fmt/fmt.h" #include "spdlog/fmt/fmt.h"

9
include/spdlog/details/logger_impl.h
View File

@ -11,7 +11,6 @@
#include <memory> #include <memory>
#include <string> #include <string>
// create logger with given name, sinks and the default pattern formatter // create logger with given name, sinks and the default pattern formatter
// all other ctors will call this one // all other ctors will call this one
template<class It> template<class It>
@ -78,7 +77,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* fmt, const Ar
{ {
_err_handler(ex.what()); _err_handler(ex.what());
} }
catch (...) SPDLOG_CATCH_ALL
{ {
_err_handler("Unknown exception"); _err_handler("Unknown exception");
} }
@ -98,7 +97,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* msg)
{ {
_err_handler(ex.what()); _err_handler(ex.what());
} }
catch (...) SPDLOG_CATCH_ALL
{ {
_err_handler("Unknown exception"); _err_handler("Unknown exception");
} }
@ -119,7 +118,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const T& msg)
{ {
_err_handler(ex.what()); _err_handler(ex.what());
} }
catch (...) SPDLOG_CATCH_ALL
{ {
_err_handler("Unknown exception"); _err_handler("Unknown exception");
} }
@ -571,3 +570,5 @@ inline const std::vector<spdlog::sink_ptr>& spdlog::logger::sinks() const
{ {
return _sinks; return _sinks;
} }
#undef SPDLOG_CATCH_ALL