From c5a92b337e60055a9840f8221e7cfc8416026873 Mon Sep 17 00:00:00 2001 From: dawidg81 Date: Wed, 4 Mar 2026 08:18:57 +0100 Subject: [PATCH] Added Logger --- src/Core/Logger.cpp | 16 ++++++++++++++++ src/Core/Logger.hpp | 11 +++++++++++ src/main.cpp | 31 +++++++++++++++++++------------ 3 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 src/Core/Logger.cpp create mode 100644 src/Core/Logger.hpp diff --git a/src/Core/Logger.cpp b/src/Core/Logger.cpp new file mode 100644 index 0000000..e4368c0 --- /dev/null +++ b/src/Core/Logger.cpp @@ -0,0 +1,16 @@ +#include "Logger.hpp" + +void Logger::raw(std::string msg) +{ + std::cout << msg << '\n'; +} + +void Logger::info(std::string msg) +{ + std::cout << "[INFO] " << msg << '\n'; +} + +void Logger::err(std::string msg) +{ + std::cerr << "[ERROR] " << msg << '\n'; +} diff --git a/src/Core/Logger.hpp b/src/Core/Logger.hpp new file mode 100644 index 0000000..9eed377 --- /dev/null +++ b/src/Core/Logger.hpp @@ -0,0 +1,11 @@ +#pragma once +#include +#include + +class Logger +{ +public: + void raw(std::string msg); + void info(std::string msg); + void err(std::string msg); +}; diff --git a/src/main.cpp b/src/main.cpp index 256072d..e7b0cb5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,5 @@ -#include +#include "Core/Logger.hpp" + #include #define NET_SOCK_ADDR "0.0.0.0" @@ -6,25 +7,31 @@ using namespace std; -class Network { +Logger log; + +class Network +{ public: - class Socket { + class Socket + { public: - int winInit() { + int winInit() + { WSADATA wsaData; int result = WSAStartup( MAKEWORD(2, 2), & wsaData ); - if (result != 0) cout << "Network.Socket.winInit: Error: Initialization error\n"; + if (result != 0) log.err("Network.Socket.winInit: Initialization error"); - cout << "Network.Socket.winInit: Socket initialized\n"; + log.info("Network.Socket.winInit: Socket initialized"); SOCKET mainSocket = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP ); if (mainSocket == INVALID_SOCKET) { - cout << "Network.Socket.winInit: Fatal error: Error creating socket: " << WSAGetLastError(); + log.err("Network.Socket.winInit: Fatal error: Error creating socket"); + log.err(WSAGetLastError()); WSACleanup(); return 1; } - cout << "Network.Socket.winInit: Socket created\n"; + log.info("Network.Socket.winInit: Socket created\n"); sockaddr_in service; memset( & service, 0, sizeof(service) ); @@ -32,15 +39,15 @@ public: service.sin_addr.s_addr = inet_addr(NET_SOCK_ADDR); service.sin_port = htons(NET_SOCK_PORT); - cout << "Network.Socket.winInit: Socket configured\n"; + log.info("Network.Socket.winInit: Socket configured\n"); if (bind(mainSocket, (SOCKADDR *) & service, sizeof(service)) == SOCKET_ERROR ) { - cout << "Network.Socket.winInit: Fatal error: Bind failed\n"; + log.err("Network.Socket.winInit: Fatal error: Bind failed"); closesocket(mainSocket); return 1; } - cout << "Network.Socket.winInit: Socket bound to address " << NET_SOCK_ADDR << " on port " << NET_SOCK_PORT << ". Ready to listen for connections\n"; + log.info("Network.Socket.winInit: Socket bound to address " + NET_SOCK_ADDR + " on port " + string to_string(NET_SOCK_PORT) + ". Ready to listen for connections"); return 0; } @@ -48,7 +55,7 @@ public: }; int main() { - cout << "mcc v0.0.0\n"; + log.raw("mcc v0.0.0"); Network::Socket socket; socket.winInit();