From 22357cd87153ab2a3c09298ab501c2a9b70b150f Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 26 Jul 2023 14:14:40 +0100 Subject: Define http500 exception, replace magic numbers --- icespider/core/core.cpp | 4 ++-- icespider/core/exceptions.cpp | 1 + icespider/core/exceptions.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/icespider/core/core.cpp b/icespider/core/core.cpp index 6aacb15..11c4f42 100644 --- a/icespider/core/core.cpp +++ b/icespider/core/core.cpp @@ -85,7 +85,7 @@ namespace IceSpider { handleError(request, e); } catch (...) { - request->response(500, "Unknown internal server error"); + request->response(Http500_InternalServerError::CODE, Http500_InternalServerError::MESSAGE); request->dump(std::cerr); } } @@ -134,7 +134,7 @@ namespace IceSpider { { auto buf = demangle(typeid(exception).name()); request->setHeader(H::CONTENT_TYPE, MIME::TEXT_PLAIN); - request->response(500, buf.get()); + request->response(Http500_InternalServerError::CODE, buf.get()); LogExp::write(request->getOutputStream(), buf.get(), exception.what()); request->dump(std::cerr); LogExp::write(std::cerr, buf.get(), exception.what()); diff --git a/icespider/core/exceptions.cpp b/icespider/core/exceptions.cpp index 8448a0b..b440c2a 100644 --- a/icespider/core/exceptions.cpp +++ b/icespider/core/exceptions.cpp @@ -11,4 +11,5 @@ namespace IceSpider { DefineHttpEx(Http405_MethodNotAllowed, 405, "Method Not Allowed"); DefineHttpEx(Http406_NotAcceptable, 406, "Not Acceptable"); DefineHttpEx(Http415_UnsupportedMediaType, 415, "Unsupported Media Type"); + DefineHttpEx(Http500_InternalServerError, 500, "Internal Server Error"); } diff --git a/icespider/core/exceptions.h b/icespider/core/exceptions.h index 03bf738..0de3f70 100644 --- a/icespider/core/exceptions.h +++ b/icespider/core/exceptions.h @@ -9,7 +9,6 @@ public: \ Name(); \ \ - private: \ static const short CODE; \ static const std::string MESSAGE; \ } @@ -20,6 +19,7 @@ namespace IceSpider { DeclareHttpEx(Http405_MethodNotAllowed); DeclareHttpEx(Http406_NotAcceptable); DeclareHttpEx(Http415_UnsupportedMediaType); + DeclareHttpEx(Http500_InternalServerError); } #undef DeclareHttpEx -- cgit v1.2.3