From 42ab0cfc97f47e6decf12eb98583485dd700b202 Mon Sep 17 00:00:00 2001 From: adjoly Date: Mon, 14 Apr 2025 13:43:42 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:=20adapted?= =?UTF-8?q?=20constructor=20to=20the=20new=20config=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/server/server.hpp | 6 +++--- src/server.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/includes/server/server.hpp b/includes/server/server.hpp index b15dab2..16e5915 100644 --- a/includes/server/server.hpp +++ b/includes/server/server.hpp @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/11 17:45:43 by adjoly #+# #+# */ -/* Updated: 2025/04/12 15:39:14 by mmoussou ### ########.fr */ +/* Updated: 2025/04/14 13:42:20 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,7 +23,7 @@ namespace webserv { class Server { public: - Server(config::Server *); + Server(config::Config *); ~Server(void); protected: @@ -44,7 +44,7 @@ class Server { */ void _handle_client(int fd); - config::Server + config::Config *_conf; ///> Pointer to the configuration class (with all config in) Logger *_log; ///> Pointer to the log class int _fd_server; ///> The fd of the socket diff --git a/src/server.cpp b/src/server.cpp index 7f8efc9..641e293 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/11 16:11:40 by adjoly #+# #+# */ -/* Updated: 2025/04/13 11:53:40 by mmoussou ### ########.fr */ +/* Updated: 2025/04/14 13:41:59 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -151,7 +151,7 @@ void Server::_run(void) } } -Server::Server(config::Server *conf) : _conf(conf) { +Server::Server(config::Config *conf) : _conf(conf) { log("➕", "Server::Server", "config constructor called"); _log = conf->getLogger(); _setup();