Relintai/crystal_cms_rcpp_fw
1
0
Fork 0
mirror of https://github.com/Relintai/crystal_cms_rcpp_fw.git synced 2025-04-22 20:41:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated the engine.

Browse Source
This commit is contained in:
Relintai 2022-01-07 20:11:57 +01:00
parent 4825794756
commit 8a0f138fed
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"master": "37d5c0fec8b6d0428daca36dff10b65e262408ef"}}
{"engine": {"master": "2133be9254088521e03c5a3b2923dc611261d223"}}

6
app/ccms_application.cpp
View File

@ -226,7 +226,7 @@ void CCMSApplication::user_page_func(Object *instance, Request *request) {
}
void CCMSApplication::setup_routes() {
DWebApplication::setup_routes();
WebRoot::setup_routes();
index_func = HandlerInstance(index);
main_route_map["admin"] = HandlerInstance(admin_page_func);
@ -239,7 +239,7 @@ void CCMSApplication::setup_middleware() {
//middlewares.push_back(HandlerInstance(::RBACUserController::rbac_user_session_setup_middleware));
middlewares.push_back(HandlerInstance(::RBACUserController::rbac_default_user_session_middleware));
DWebApplication::setup_middleware();
WebRoot::setup_middleware();
}
void CCMSApplication::migrate() {
@ -272,7 +272,7 @@ void CCMSApplication::compile_menu() {
}
CCMSApplication::CCMSApplication() :
DWebApplication() {
WebRoot() {
_rbac_controller = new RBACController();
_rbac_controller->initialize();

4
app/ccms_application.h
View File

@ -3,7 +3,7 @@
//#include "core/http/web_application.h"
#include "core/object.h"
#include "modules/drogon/web_application.h"
#include "core/http/web_root.h"
#undef LOG_TRACE
#undef LOG_WARN
@ -23,7 +23,7 @@ class RBACModel;
return; \
}
class CCMSApplication : public DWebApplication {
class CCMSApplication : public WebRoot {
public:
enum MenuEntries {
MENUENTRY_NEWS = 0,

19
main.cpp
View File

@ -2,9 +2,8 @@
#include <iostream>
#include <string>
#include "core/bry_http/http_server.h"
#include "core/file_cache.h"
#include "core/http/web_application.h"
#include "core/http/web_root.h"
#include "app/ccms_application.h"
@ -15,8 +14,6 @@
#include "core/http/session_manager.h"
#define MAIN_CLASS CCMSApplication
#include "modules/drogon/web_application.h"
// Backends
@ -66,11 +63,14 @@ int main(int argc, char **argv, char **envp) {
create_databases();
DWebApplication *app = new MAIN_CLASS();
DWebApplication *app = new DWebApplication();
CCMSApplication *app_root = new CCMSApplication();
app->load_settings();
app->setup_routes();
app->setup_middleware();
app->set_root(app_root);
app_root->load_settings();
app_root->setup_routes();
app_root->setup_middleware();
app->add_listener("127.0.0.1", 8080);
LOG_INFO << "Server running on 127.0.0.1:8080";
@ -96,10 +96,11 @@ int main(int argc, char **argv, char **envp) {
user_controller->create_test_users();
}
app->migrate();
app_root->migrate();
}
delete app;
delete app_root;
delete dbm;
delete file_cache;
delete settings;