From 07e614eef7c88daa734e5d32e050f1e7138a99db Mon Sep 17 00:00:00 2001 From: yhirose Date: Fri, 15 Jul 2022 17:32:38 -0400 Subject: [PATCH] clangformat and README update --- README.md | 14 +++++++++++--- test/test.cc | 6 ++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 48eb423..36acd2a 100644 --- a/README.md +++ b/README.md @@ -212,15 +212,23 @@ svr.set_error_handler([](const auto& req, auto& res) { The exception handler gets called if a user routing handler throws an error. ```cpp -svr.set_exception_handler([](const auto& req, auto& res, std::exception &e) { - res.status = 500; +svr.set_exception_handler([](const auto& req, auto& res, std::exception_ptr ep) { auto fmt = "

Error 500

%s

"; char buf[BUFSIZ]; - snprintf(buf, sizeof(buf), fmt, e.what()); + try { + std::rethrow_exception(ep); + } catch (std::exception &e) { + snprintf(buf, sizeof(buf), fmt, e.what()); + } catch (...) { // See the following NOTE + snprintf(buf, sizeof(buf), fmt, "Unknown Exception"); + } res.set_content(buf, "text/html"); + res.status = 500; }); ``` +NOTE: if you don't provide the `catch (...)` block for a rethrown exception pointer, an uncaught exception will end up causing the server crash. Be careful! + ### Pre routing handler ```cpp diff --git a/test/test.cc b/test/test.cc index 58dc5b2..6ca8497 100644 --- a/test/test.cc +++ b/test/test.cc @@ -1251,11 +1251,9 @@ TEST(ExceptionHandlerTest, ContentLength) { svr.set_exception_handler([](const Request & /*req*/, Response &res, std::exception_ptr ep) { EXPECT_FALSE(ep == nullptr); - try{ + try { std::rethrow_exception(ep); - }catch(std::exception& e){ - EXPECT_EQ("abc", std::string(e.what())); - } + } catch (std::exception &e) { EXPECT_EQ("abc", std::string(e.what())); } res.status = 500; res.set_content("abcdefghijklmnopqrstuvwxyz", "text/html"); // <= Content-Length still 13 at this point