Relintai/rcpp_framework
1
0
Fork 0
mirror of https://github.com/Relintai/rcpp_framework.git synced 2025-05-02 13:47:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reworked error handling.

Browse Source
This commit is contained in:
Relintai 2022-01-08 11:47:39 +01:00
parent 413e9efbc8
commit fd106fc785
5 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/http/request.cpp
View File

@ -108,7 +108,7 @@ void Request::send_file(const String &p_file_path) {
} }
void Request::send_error(int error_code) { void Request::send_error(int error_code) {
server->get_web_root()->send_error(error_code, this); server->get_web_root()->handle_error_send_request(this, error_code);
} }
void Request::reset() { void Request::reset() {

9
core/http/web_node.cpp
View File

@ -2,6 +2,7 @@
#include "web_node.h" #include "web_node.h"
#include "request.h" #include "request.h"
#include "http_enums.h"
#include "core/settings/settings.h" #include "core/settings/settings.h"
@ -70,6 +71,14 @@ void WebNode::set_database(Database *db) {
void WebNode::handle_request_main(Request *request) { void WebNode::handle_request_main(Request *request) {
} }
void WebNode::handle_error_send_request(Request *request, const int error_code) {
//this is a fallback error handler.
//Webroot implements a proper one
request->compiled_body = "<html><body>Internal server error!</body></html>";
request->set_status_code(HTTP_STATUS_CODE_503_SERVICE_UNAVAILABLE);
request->send();
}
void WebNode::create_validators() { void WebNode::create_validators() {
} }

3
core/http/web_node.h
View File

@ -3,6 +3,7 @@
#include "core/nodes/node.h" #include "core/nodes/node.h"
#include "core/reference.h" #include "core/reference.h"
#include "core/variant.h"
class Request; class Request;
class Settings; class Settings;
@ -31,6 +32,8 @@ public:
#endif #endif
virtual void handle_request_main(Request *request); virtual void handle_request_main(Request *request);
virtual void handle_error_send_request(Request *request, const int error_code);
virtual void create_validators(); virtual void create_validators();
virtual void create_table(); virtual void create_table();

4
core/http/web_root.cpp
View File

@ -93,6 +93,10 @@ void WebRoot::handle_request_main(Request *request) {
// normal routing // normal routing
WebRouterNode::handle_request_main(request); WebRouterNode::handle_request_main(request);
} }
/*
void WebRoot::handle_error_send_request(Request *request, const int error_code) {
}*/
bool WebRoot::try_send_wwwroot_file(Request *request) { bool WebRoot::try_send_wwwroot_file(Request *request) {
const String &path = request->get_path_full(); const String &path = request->get_path_full();

2
core/http/web_root.h
View File

@ -35,6 +35,8 @@ public:
static std::string default_generic_error_body; static std::string default_generic_error_body;
void handle_request_main(Request *request); void handle_request_main(Request *request);
//void handle_error_send_request(Request *request, const int error_code);
bool try_send_wwwroot_file(Request *request); bool try_send_wwwroot_file(Request *request);
void send_error(int error_code, Request *request); void send_error(int error_code, Request *request);
void send_file(const std::string &path, Request *request); void send_file(const std::string &path, Request *request);