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

util/Exception: move code to AppendNestedMessage()

Browse Source
This commit is contained in:
Max Kellermann 2017-07-05 17:04:32 +02:00
parent ba09e22c30
commit 8679074be7
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/util/Exception.cxx
View File

@ -29,18 +29,32 @@
#include "Exception.hxx"
template<typename T>
static void
AppendNestedMessage(std::string &result, T &&e,
const char *fallback, const char *separator) noexcept
{
try {
std::rethrow_if_nested(std::forward<T>(e));
} catch (const std::exception &nested) {
result += separator;
result += nested.what();
AppendNestedMessage(result, nested, fallback, separator);
} catch (const std::nested_exception &ne) {
AppendNestedMessage(result, ne, fallback, separator);
} catch (...) {
result += separator;
result += fallback;
}
}
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 result = e.what();
AppendNestedMessage(result, e, fallback, separator);
return result;
}
std::string
@ -53,7 +67,7 @@ GetFullMessage(std::exception_ptr ep,
return GetFullMessage(e, fallback, separator);
} catch (const std::nested_exception &ne) {
return GetFullMessage(ne.nested_ptr(), fallback, separator);
} catch (...) {
return fallback;
}
return fallback;
}