Browse Source

clangformat and README update

yhirose 3 years ago
parent
commit
07e614eef7
2 changed files with 13 additions and 7 deletions
  1. 11 3
      README.md
  2. 2 4
      test/test.cc

+ 11 - 3
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 = "<h1>Error 500</h1><p>%s</p>";
   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

+ 2 - 4
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