http: Change exception formating to the generic seastar one

It is beneficial to get the full context that an exception can provide. When http translates an exception into an http responce json, it ignored the case of nested exception and always printed the last exception. This patch makes use of seastars ability to print out exception to the log along with types and nested exceptions information. Signed-off-by: Eliran Sinvani <[email protected]> Message-Id: <[email protected]>
cyx1231st · Dec 19, 2019 · 9612a94 · 9612a94
1 parent 0bde519
commit 9612a94
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/include/seastar/http/exception.hh b/include/seastar/http/exception.hh
@@ -20,7 +20,7 @@
  */
 
 #pragma once
-
+#include <seastar/util/log.hh>
 #include <seastar/http/reply.hh>
 #include <seastar/json/json_elements.hh>
 
@@ -124,8 +124,10 @@ public:
         set(e.str(), e.status());
     }
 
-    json_exception(const std::exception& e) {
-        set(e.what(), reply::status_type::internal_server_error);
+    json_exception(std::exception_ptr e) {
+	std::ostringstream exception_description;
+	exception_description << e;
+	set(exception_description.str(), reply::status_type::internal_server_error);
     }
 private:
     void set(const std::string& msg, reply::status_type code) {

diff --git a/src/http/routes.cc b/src/http/routes.cc
@@ -71,14 +71,11 @@ std::unique_ptr<reply> routes::exception_reply(std::exception_ptr eptr) {
         std::rethrow_exception(eptr);
     } catch (const base_exception& e) {
         rep->set_status(e.status(), json_exception(e).to_json());
-    } catch (exception& e) {
-        rep->set_status(reply::status_type::internal_server_error,
-                json_exception(e).to_json());
     } catch (...) {
         rep->set_status(reply::status_type::internal_server_error,
-                json_exception(std::runtime_error(
-                        "Unknown unhandled exception")).to_json());
+                json_exception(std::current_exception()).to_json());
     }
+
     rep->done("json");
     return rep;
 }