From 1a2a975046c9f086b27e56bfa0bef160007395a6 Mon Sep 17 00:00:00 2001
From: flomero <49640251+flomero@users.noreply.github.com>
Date: Fri, 17 Jan 2025 09:39:31 +0100
Subject: [PATCH] loggr

---
 examples/uploadthing/.conf              |  6 +++---
 include/log/Logger.hpp                  | 13 ++++++++++---
 src/Server/ClientConnection.cpp         |  7 +++----
 src/http/RequestHandler/PostRequest.cpp |  3 +--
 src/http/messages/HttpRequest.cpp       |  8 +++-----
 src/log/Logger.cpp                      |  7 ++++++-
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/examples/uploadthing/.conf b/examples/uploadthing/.conf
index 3265368c..391d2e78 100644
--- a/examples/uploadthing/.conf
+++ b/examples/uploadthing/.conf
@@ -4,9 +4,9 @@ http {
         server_name 1-E-17.42heilbronn.de localhost;
         root /examples/uploadthing;
         index /index.html;
-        client_max_body_size 1024k;
-        client_body_buffer_size 1024k;
-        client_header_buffer_size 1024k;
+        client_max_body_size 1g;
+        client_body_buffer_size 1g;
+        client_header_buffer_size 1g;
         upload_dir /uploads;
         request_timeout 1d 4h 30m 20s 5ms;
 
diff --git a/include/log/Logger.hpp b/include/log/Logger.hpp
index d2a5243e..f6206ea7 100644
--- a/include/log/Logger.hpp
+++ b/include/log/Logger.hpp
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Logger.hpp                                         :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: lgreau <lgreau@student.42heilbronn.de>     +#+  +:+       +#+        */
+/*   By: flfische <flfische@student.42heilbronn.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/10/09 14:14:03 by flfische          #+#    #+#             */
-/*   Updated: 2024/10/15 16:21:42 by lgreau           ###   ########.fr       */
+/*   Updated: 2025/01/17 09:39:23 by flfische         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,17 +19,23 @@
 
 #include "ft_iomanip.hpp"
 
+#define TRACE_COLOR PURPLE
 #define DEBUG_COLOR BLUE
 #define INFO_COLOR CYAN
 #define WARN_COLOR YELLOW
 #define ERROR_COLOR RED
 
+#define TRACE_PREFIX TRACE_COLOR "[TRACE]" RESET_COLOR
 #define DEBUG_PREFIX DEBUG_COLOR "[DEBUG]" RESET_COLOR
 #define INFO_PREFIX INFO_COLOR "[INFO]" RESET_COLOR
 #define WARN_PREFIX WARN_COLOR "[WARN]" RESET_COLOR
 #define ERROR_PREFIX ERROR_COLOR "[ERROR]" RESET_COLOR
 
-enum LogLevel { DEBUG, INFO, WARN, ERROR };
+#ifndef LOG_LEVEL
+#define LOG_LEVEL DEBUG
+#endif
+
+enum LogLevel { TRACE, DEBUG, INFO, WARN, ERROR };
 
 class Logger {
 	public:
@@ -52,6 +58,7 @@ class Logger {
 
 std::ostream& operator<<(std::ostream& os, LogLevel level);
 
+#define LOG_TRACE(msg) Logger::getInstance().log(msg, TRACE)
 #define LOG_DEBUG(msg) Logger::getInstance().log(msg, DEBUG)
 #define LOG_INFO(msg) Logger::getInstance().log(msg, INFO)
 #define LOG_WARN(msg) Logger::getInstance().log(msg, WARN)
diff --git a/src/Server/ClientConnection.cpp b/src/Server/ClientConnection.cpp
index 9c538d86..16e58154 100644
--- a/src/Server/ClientConnection.cpp
+++ b/src/Server/ClientConnection.cpp
@@ -84,7 +84,7 @@ bool ClientConnection::_receiveHeader() {
 		return false;
 	}
 
-	LOG_DEBUG(_log("Header content: \n" + std::string(_headerBuffer.begin(), _headerBuffer.end())));
+	LOG_TRACE(_log("Header content: \n" + std::string(_headerBuffer.begin(), _headerBuffer.end())));
 	LOG_DEBUG(_log("Header buffer size after read: " + std::to_string(_headerBuffer.size())));
 
 	std::vector<char> header;
@@ -435,7 +435,6 @@ bool ClientConnection::_parseHttpRequestHeader(const std::string& header) {
 
 void ClientConnection::sendResponse() {
 	if (_status != Status::READY_TO_SEND) {
-		// LOG_ERROR("Response is not ready to be sent");
 		return;
 	}
 	if (!_response.getStatus()) {
@@ -443,7 +442,7 @@ void ClientConnection::sendResponse() {
 		_response = _requestHandler.handleRequest(_request);
 	}
 	LOG_INFO(_log("Sending response with status code: " + std::to_string(_response.getStatus())));
-	LOG_DEBUG(_log("Response: \n" + _response.toString()));
+	LOG_TRACE(_log("Response: \n" + _response.toString()));
 	if (!_sendDataToClient(_response.toString())) {
 		return;
 	}
@@ -508,7 +507,7 @@ std::optional<size_t> ClientConnection::_findHeaderEnd(const std::vector<char>&
 bool ClientConnection::isDisconnected() const { return _disconnected; }
 
 void ClientConnection::_logHeader() const {
-	LOG_DEBUG(_log("Request recieved:\n====================\n" + toString(_request) + "\n===================="));
+	LOG_TRACE(_log("Request recieved:\n====================\n" + toString(_request) + "\n===================="));
 }
 
 std::string ClientConnection::_log(const std::string& msg) const {
diff --git a/src/http/RequestHandler/PostRequest.cpp b/src/http/RequestHandler/PostRequest.cpp
index 50a08530..75abd019 100644
--- a/src/http/RequestHandler/PostRequest.cpp
+++ b/src/http/RequestHandler/PostRequest.cpp
@@ -6,7 +6,7 @@
 /*   By: flfische <flfische@student.42heilbronn.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/10/11 14:43:11 by flfische          #+#    #+#             */
-/*   Updated: 2025/01/15 16:03:33 by flfische         ###   ########.fr       */
+/*   Updated: 2025/01/16 20:26:16 by flfische         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -104,7 +104,6 @@ std::string buildpath(const std::string &path, const std::string &filename, cons
 }
 
 HttpResponse RequestHandler::handleFileUpload(const std::string &part, const std::string &contentDisposition) {
-	LOG_DEBUG("Handling file upload");
 	std::string filename;
 	std::size_t filenamePos = contentDisposition.find("filename=");
 	if (filenamePos != std::string::npos) {
diff --git a/src/http/messages/HttpRequest.cpp b/src/http/messages/HttpRequest.cpp
index 2c0d5e72..c695b955 100644
--- a/src/http/messages/HttpRequest.cpp
+++ b/src/http/messages/HttpRequest.cpp
@@ -6,7 +6,7 @@
 /*   By: flfische <flfische@student.42heilbronn.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/10/04 16:19:37 by flfische          #+#    #+#             */
-/*   Updated: 2025/01/15 21:16:39 by flfische         ###   ########.fr       */
+/*   Updated: 2025/01/17 09:28:25 by flfische         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -79,8 +79,6 @@ void HttpRequest::_validateRequestLine() const {
 }
 
 void HttpRequest::_validateHeaders() const {
-	// TODO: check if Host header is required
-	// TODO: check if other stuff is required
 	if (_method == "POST" && _bodyType == BodyType::NO_BODY) {
 		throw BadRequest();
 	}
@@ -93,10 +91,10 @@ void HttpRequest::_parseURI() {
 	}
 	LOG_DEBUG("  |- Location:            " + _location);
 	if (size_t queryStart = _location.find_first_of('?'); queryStart != std::string::npos) {
-		LOG_DEBUG("  |- Query string found:  " + _location);
+		LOG_TRACE("  |- Query string found:  " + _location);
 		_queryString = _location.substr(queryStart + 1, _location.back());
 		_location = _location.substr(0, queryStart);
-		LOG_DEBUG("  |- Query string:        " + _queryString);
+		LOG_TRACE("  |- Query string:        " + _queryString);
 	}
 }
 
diff --git a/src/log/Logger.cpp b/src/log/Logger.cpp
index 4f9a73c7..ac1ea76c 100644
--- a/src/log/Logger.cpp
+++ b/src/log/Logger.cpp
@@ -6,7 +6,7 @@
 /*   By: flfische <flfische@student.42heilbronn.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/10/09 14:20:32 by flfische          #+#    #+#             */
-/*   Updated: 2024/10/09 15:21:54 by flfische         ###   ########.fr       */
+/*   Updated: 2025/01/17 09:29:31 by flfische         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -33,6 +33,8 @@ void Logger::setOutputToConsole() {
 }
 
 void Logger::log(const std::string& msg, const LogLevel level) {
+	if (level < LOG_LEVEL)
+		return;
 	const std::time_t now = std::time(nullptr);
 	if (outputToFile) {
 		logFile << std::left << std::put_time(std::localtime(&now), "%F %T") << " " << std::left << std::setw(20)
@@ -45,6 +47,9 @@ void Logger::log(const std::string& msg, const LogLevel level) {
 
 std::ostream& operator<<(std::ostream& os, const LogLevel level) {
 	switch (level) {
+		case TRACE:
+			os << TRACE_PREFIX;
+			break;
 		case DEBUG:
 			os << DEBUG_PREFIX;
 			break;