diff --git a/src/util.cpp b/src/util.cpp index 53b25596cb56..04093880bd0f 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -576,14 +576,9 @@ std::string HelpMessageOpt(const std::string &option, const std::string &message std::string("\n\n"); } -static std::string FormatException(const std::exception_ptr pex, const char* pszThread) +void PrintExceptionContinue(const std::exception_ptr pex, const char* pszExceptionOrigin) { - return GetPrettyExceptionStr(pex); -} - -void PrintExceptionContinue(const std::exception_ptr pex, const char* pszThread) -{ - std::string message = FormatException(pex, pszThread); + std::string message = strprintf("\"%s\" raised an exception\n%s", pszExceptionOrigin, GetPrettyExceptionStr(pex)); LogPrintf("\n\n************************\n%s\n", message); fprintf(stderr, "\n\n************************\n%s\n", message.c_str()); } diff --git a/src/util.h b/src/util.h index d2282ab78fee..5dc45d4b7de0 100644 --- a/src/util.h +++ b/src/util.h @@ -90,7 +90,7 @@ bool error(const char* fmt, const Args&... args) return false; } -void PrintExceptionContinue(const std::exception_ptr pex, const char* pszThread); +void PrintExceptionContinue(const std::exception_ptr pex, const char* pszExceptionOrigin); void FileCommit(FILE *file); bool TruncateFile(FILE *file, unsigned int length); int RaiseFileDescriptorLimit(int nMinFD);