TeaSpeak/spdlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed catch(..) from the codebase. Catch only std::exception

Browse Source
This commit is contained in:
gabime 2017-11-12 19:46:15 +02:00
parent 63d7c64618
commit 8ca1d84a32
4 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/spdlog/common.h
View File

@ -42,13 +42,6 @@
#define SPDLOG_DEPRECATED #define SPDLOG_DEPRECATED
#endif #endif
#if defined(__linux__) && !defined(__ANDROID__)
#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 "fmt/fmt.h" #include "fmt/fmt.h"
namespace spdlog namespace spdlog

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

@ -279,11 +279,7 @@ inline void spdlog::details::async_log_helper::worker_loop()
catch (const std::exception &ex) catch (const std::exception &ex)
{ {
_err_handler(ex.what()); _err_handler(ex.what());
} }
catch (...)
{
_err_handler("Unknown exception");
}
} }
if (_worker_teardown_cb) _worker_teardown_cb(); if (_worker_teardown_cb) _worker_teardown_cb();

6
include/spdlog/details/async_logger_impl.h
View File

@ -97,9 +97,5 @@ inline void spdlog::async_logger::_sink_it(details::log_msg& msg)
catch (const std::exception &ex) catch (const std::exception &ex)
{ {
_err_handler(ex.what()); _err_handler(ex.what());
} }
catch (...)
{
_err_handler("Unknown exception");
}
} }

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

@ -76,11 +76,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* fmt, const Ar
catch (const std::exception &ex) catch (const std::exception &ex)
{ {
_err_handler(ex.what()); _err_handler(ex.what());
} }
SPDLOG_CATCH_ALL
{
_err_handler("Unknown exception");
}
} }
template <typename... Args> template <typename... Args>
@ -96,12 +92,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const char* msg)
catch (const std::exception &ex) catch (const std::exception &ex)
{ {
_err_handler(ex.what()); _err_handler(ex.what());
} }
SPDLOG_CATCH_ALL
{
_err_handler("Unknown exception");
}
} }
template<typename T> template<typename T>
@ -117,11 +108,7 @@ inline void spdlog::logger::log(level::level_enum lvl, const T& msg)
catch (const std::exception &ex) catch (const std::exception &ex)
{ {
_err_handler(ex.what()); _err_handler(ex.what());
} }
SPDLOG_CATCH_ALL
{
_err_handler("Unknown exception");
}
} }
@ -571,4 +558,3 @@ inline const std::vector<spdlog::sink_ptr>& spdlog::logger::sinks() const
return _sinks; return _sinks;
} }
#undef SPDLOG_CATCH_ALL