fix(compile): fix compilation error

dantol29 · May 22, 2024 · 34f26b1 · 34f26b1
1 parent de35844
commit 34f26b1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/src/HTTPResponse.cpp b/src/HTTPResponse.cpp
@@ -33,7 +33,7 @@ std::string HTTPResponse::objToString() const
 	std::stringstream responseStream;
 	if (_statusCode == 0)
 	{
-		std::cerr << "\033[31mWarning: Sending a response with status code 0\033[0m" << std::endl;
+		Debug::log("Sending a response with status code 0", Debug::NORMAL);
 	}
 	responseStream << "HTTP/1.1 " << _statusCode << " " << getStatusMessage(_statusCode) << "\r\n";
 	for (size_t i = 0; i < _headers.size(); ++i)
@@ -70,12 +70,13 @@ int HTTPResponse::getStatusCode() const
 void HTTPResponse::setStatusCode(int statusCode, const std::string &message)
 {
 	if (!message.empty())
-		std::cerr << message << std::endl;
+		Debug::log(message, Debug::NORMAL);
 	if (_statusCode != 0)
 	{
-		std::cerr << "\033[31mWarning: Overwriting existing status code (" << _statusCode << ") and message ("
-				  << _statusMessage << ") with new code (" << statusCode << ") and message ("
-				  << getStatusMessage(statusCode) << ").\033[0m" << std::endl;
+		Debug::log("Warning: Overwriting existing status code (" + toString(_statusCode) + ") and message (" +
+					   _statusMessage + ") with new code (" + toString(statusCode) + ") and message (" +
+					   getStatusMessage(statusCode) + ").",
+				   Debug::NORMAL);
 	}
 
 	_statusCode = statusCode;

diff --git a/src/Router.cpp b/src/Router.cpp
@@ -69,7 +69,7 @@ void Router::routeRequest(HTTPRequest &request, HTTPResponse &response)
 	Debug::log("Routing Request: path = " + request.getPath(), Debug::NORMAL);
 
 	PathValidation pathResult = pathIsValid(response, request);
-	Debug::log("Routing Request: pathResult = " + std::to_string(pathResult), Debug::NORMAL);
+	Debug::log("Routing Request: pathResult = " + toString(pathResult), Debug::NORMAL);
 	Debug::log("Path requested: " + request.getPath(), Debug::NORMAL);
 	// check if method is allowed
 

diff --git a/src/Server.cpp b/src/Server.cpp
@@ -54,7 +54,7 @@ const EventManager &Server::getEventManager() const
 void Server::startListening()
 {
 	createServerSockets(_serverBlocks);
-	printServerSockets();
+	//printServerSockets();
 	setReuseAddrAndPort();
 	checkSocketOptions();
 	bindToPort();
@@ -124,8 +124,8 @@ void Server::waitCGI()
 	Debug::log("PID: " + toString(pid), Debug::CGI);
 
 	for (size_t i = 0; i < originalSize && i < _FDs.size(); i++)
-		Debug::log("PID: " + toString(_connections[i].getCGIPid() + ", hasCGI: " + \
-		toString(_connections[i].getHasCGI())), Debug::CGI);
+		Debug::log("PID: " + toString(_connections[i].getCGIPid()) + ", hasCGI: " + \
+		toString(_connections[i].getHasCGI()), Debug::CGI);
 
 	if (pid > 0)
 	{
@@ -561,7 +561,7 @@ void Server::createServerSockets(std::vector<ServerBlock> &serverBlocks)
 		}
 		else
 		{
-			std::cout << "IPV6_V6ONLY: " << ipv6only << std::endl;
+			Debug::log("IPV6_V6ONLY: " + toString(ipv6only), Debug::SERVER);
 		}
 		ServerSocket serverSocket(serverFD, *it);
 		_serverSockets.push_back(serverSocket);

diff --git a/src/Server.hpp b/src/Server.hpp
@@ -21,7 +21,7 @@
 #include "ServerSocket.hpp"
 #include "EventManager.hpp"
 
-#define VERBOSE 1
+#define VERBOSE 0
 
 class Connection; // Forward declaration for circular dependencyA
 

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
@@ -122,8 +122,9 @@ void ServerSocket::prepareServerSocketAddr()
 
 std::ostream &operator<<(std::ostream &out, const ServerSocket &socket)
 {
-	out << "Fd: " << socket.getServerFD() << std::endl;
-	out << "Listen: " << socket.getListen() << std::endl;
+	(void)socket;
+	//out << "Fd: " << socket.getServerFD() << std::endl;
+	//out << "Listen: " << socket.getListen() << std::endl;
 	// out << "ServerSocketAddr: " << socket.getServerSocketAddr() << std::endl;
 	return out;
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -6,7 +6,7 @@
 
 int main(int argc, char **argv)
 {
-	Debug::enable(true);
+	Debug::enable(false);
 	Debug::setLevel(Debug::NORMAL);
 
 	if (argc > 2)
@@ -19,16 +19,14 @@ int main(int argc, char **argv)
 	if (!config.getErrorMessage().empty())
 		return 1;
 
-	std::cout << config << std::endl; // should be in the DEBUG?
+	//std::cout << config << std::endl; // should be in the DEBUG?
 	EventManager eventManager;
 	Server webserv(config, eventManager);
 
 	ServerEventListener serverEventListener(webserv);
 
 	eventManager.subscribe(&serverEventListener);
 
-	std::cout << &webserv.getEventManager() << std::endl;
-
 	webserv.startListening();
 	webserv.startPollEventLoop();