oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/Exception: add GetFullMessage(std::exception)

Browse Source
This commit is contained in:
Max Kellermann 2017-07-05 17:02:21 +02:00
parent 6515b9727d
commit ba09e22c30
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/util/Exception.cxx
View File

@ -29,6 +29,20 @@
#include "Exception.hxx"
std::string
GetFullMessage(const std::exception &e,
const char *fallback, const char *separator) noexcept
{
try {
std::rethrow_if_nested(e);
return e.what();
} catch (...) {
return std::string(e.what()) + separator +
GetFullMessage(std::current_exception(),
fallback, separator);
}
}
std::string
GetFullMessage(std::exception_ptr ep,
const char *fallback, const char *separator) noexcept
@ -36,14 +50,7 @@ GetFullMessage(std::exception_ptr ep,
try {
std::rethrow_exception(ep);
} catch (const std::exception &e) {
try {
std::rethrow_if_nested(e);
return e.what();
} catch (...) {
return std::string(e.what()) + separator +
GetFullMessage(std::current_exception(),
fallback, separator);
}
return GetFullMessage(e, fallback, separator);
} catch (const std::nested_exception &ne) {
return GetFullMessage(ne.nested_ptr(), fallback, separator);
}

9
src/util/Exception.hxx
View File

@ -33,6 +33,15 @@
#include <exception>
#include <string>
/**
* Obtain the full concatenated message of an exception and its nested
* chain.
*/
std::string
GetFullMessage(const std::exception &e,
const char *fallback="Unknown exception",
const char *separator="; ") noexcept;
/**
* Extract the full message of a C++ exception, considering its nested
* exceptions (if any).