From d5aeccb57621dbf9f4bb8b695c35bbdc1e02d5ec Mon Sep 17 00:00:00 2001 From: Lutra Date: Tue, 11 Jun 2024 18:35:32 +0200 Subject: [PATCH] modified: src/core/ConfigManager.cpp modified: src/core/EventBus.cpp modified: src/core/main.cpp modified: src/resolver/Server.cpp modified: src/resolver/include/Server.hpp modified: src/ui/Server.cpp Clean up log messages --- src/core/ConfigManager.cpp | 8 ++-- src/core/EventBus.cpp | 14 +++--- src/core/main.cpp | 14 +++--- src/resolver/Server.cpp | 80 ++++++++++++++++----------------- src/resolver/include/Server.hpp | 5 +-- src/ui/Server.cpp | 12 ++--- 6 files changed, 65 insertions(+), 68 deletions(-) diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp index 16b6e90..d7d5ca7 100644 --- a/src/core/ConfigManager.cpp +++ b/src/core/ConfigManager.cpp @@ -13,7 +13,7 @@ ConfigManager::ConfigManager(vector& parameters) : { // move this to a function that can return an error code? if ( parameters.size() == 0 ) return; - _logger.debug.ln ("Loading Configuration..."); + _logger.debug.ln ("[Core:ConfigManager] Loading Configuration..."); /* for (unsigned i = 0; i < (numParameters-1); ++i) { @@ -21,13 +21,13 @@ ConfigManager::ConfigManager(vector& parameters) : string v = string(parameters[i+1]); // Check if this parameter is an argument or an argument value: if ( p.compare(0,1,"-") == 0 ) { - _logger.debug("Interpreting parameter " << p); - if ( ! p.compare("--initial-peer") ) _logger.debug("Peer " << v << " set"); + _logger.debug("[Core:ConfigManager] Interpreting parameter " << p); + if ( ! p.compare("--initial-peer") ) _logger.debug("[Core:ConfigManager] Peer " << v << " set"); } } */ - _logger.debug.ln ("Configuration successfully parsed"); + _logger.debug.ln ("[Core:ConfigManager] Configuration successfully parsed"); } diff --git a/src/core/EventBus.cpp b/src/core/EventBus.cpp index a6e10ea..989ab7b 100644 --- a/src/core/EventBus.cpp +++ b/src/core/EventBus.cpp @@ -8,30 +8,30 @@ namespace Core { EventBus::EventBus() : _logger(Logger::getInstance()) { - _logger.debug.ln ("Starting Event Bus..."); + _logger.debug.ln ("[Core:EventBus] Starting Event Bus..."); //_thread = thread(&EventBus::run, this); - _logger.debug.ln ("Event Bus Started"); + _logger.debug.ln ("[Core:EventBus] Event Bus Started"); } EventBus::~EventBus() { - _logger.debug.ln ("Stopping Event Bus..."); + _logger.debug.ln ("[Core:EventBus] Stopping Event Bus..."); //_thread.join(); // destroy all events in _events vector for (auto event : _events) { delete event; } - _logger.debug.ln ("Event Bus stopped"); + _logger.debug.ln ("[Core:EventBus] Event Bus stopped"); } Event& EventBus::registerEvent(const string& eventID) { _mutex.lock(); for ( const auto event : _events ) { if (event->getID() == eventID) { - _logger.debug << "Event '" << eventID << "' found" << Logger::commit; + _logger.debug << "[Core:EventBus] Event '" << eventID << "' found" << Logger::commit; _mutex.unlock(); return *event; } } //If event with that id does not exist, create it: - _logger.debug << "Registering new Event '" << eventID << "'" << Logger::commit; + _logger.debug << "[Core:EventBus] Registering new Event '" << eventID << "'" << Logger::commit; Event* event = new Event(eventID); _events.push_back(event); _mutex.unlock(); @@ -41,7 +41,7 @@ Event& EventBus::registerEvent(const string& eventID) { void EventBus::run() { while (true) { std::this_thread::sleep_for(std::chrono::seconds(15)); - //_logger.warn.ln("EventBus: Looping..."); + //_logger.warn.ln("[Core:EventBus] Looping..."); } } diff --git a/src/core/main.cpp b/src/core/main.cpp index 2f51354..f4f2094 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -23,7 +23,7 @@ int main(int args, char **argv) { try { - logger.info.ln ("Starting Plains..."); + logger.info.ln ("[Core:Main] Starting Plains..."); vector arguments; for ( unsigned index = 0; index < args; ++index ) { @@ -61,22 +61,22 @@ int main(int args, char **argv) { //Record testrec = ARecord(); // End of Testcode - logger.info.ln ("Plains successfully started."); + logger.info.ln ("[Core:Main] Plains successfully started."); //shutdown(); //eventBus.run(); } catch (Exception& e) { - logger.fatal << "Uncaught Exception: " << e.what() << Logger::commit; + logger.fatal << "[Core:Main] Uncaught Exception: " << e.what() << Logger::commit; //shutdown(); return 1; } catch (std::system_error& e) { - logger.fatal << "Uncaught system_error exception: " << e.what() << Logger::commit; + logger.fatal << "[Core:Main] Uncaught system_error exception: " << e.what() << Logger::commit; //shutdown(); return 1; } catch (int e) { - logger.fatal << "Uncaught Exception with error code " << e << Logger::commit; + logger.fatal << "[Core:Main] Uncaught Exception with error code " << e << Logger::commit; //shutdown(); return 1; } @@ -98,12 +98,12 @@ void signalHandler( int signalNumber ) { } /* void shutdown() { - Logger::getInstance().info << "Shutting down Plains..." << Logger::commit; + Logger::getInstance().info << "[Core:Main] Shutting down Plains..." << Logger::commit; globalResolver->~Server(); globalUIServer->~Server(); globalEventBus->~EventBus(); globalConfigManager->~ConfigManager(); - Logger::getInstance().info.ln ("Plains shut down."); + Logger::getInstance().info.ln ("[Core:Main] Plains shut down."); //globalLogger->~Logger(); } */ diff --git a/src/resolver/Server.cpp b/src/resolver/Server.cpp index 5ec300b..d9b9bfe 100644 --- a/src/resolver/Server.cpp +++ b/src/resolver/Server.cpp @@ -26,11 +26,11 @@ Server::Server(EventBus& eventBus) : _logger(Logger::getInstance()), _eventBus(eventBus) { - _logger.debug.ln ("Starting Resolver..."); + _logger.debug.ln ("[Resolver:Server] Starting Resolver..."); - _logger.warn << "Testing some stuff..." << Logger::commit; - //_logger.warn << "Message class overall size: " << sizeof(Message) << Logger::commit; - //_logger.debug << "Message::QR:RESPONSE Enum:" << Message::QR::RESPONSE << endl; + _logger.warn << "[Resolver:Server] Testing some stuff..." << Logger::commit; + //_logger.warn << "[Resolver:Server] Message class overall size: " << sizeof(Message) << Logger::commit; + //_logger.debug << "[Resolver:Server] Message::QR:RESPONSE Enum:" << Message::QR::RESPONSE << endl; /* std::fstream myfile; @@ -43,25 +43,25 @@ Server::Server(EventBus& eventBus) const unsigned long size = end-beg; Message* message = new Message; myfile.read ((char*)header, sizeof(Message)); - _logger.debug << "size is: " << size << " bytes." << Logger::commit; + _logger.debug << "[Resolver:Server] size is: " << size << " bytes." << Logger::commit; - _logger.debug << "Header: " << Logger::commit; - //_logger.debug << "ID: " << 0x1ef8 << - _logger.debug << "ID: " << intToHex(2, header->id) << - " QR: " << byteToHex(header->qr) << - " OPCode: " << byteToHex(header->opCode) << Logger::commit << - "Authoritive Answer: " << byteToHex(header->aa) << Logger::commit << - "Truncation Flag: " << byteToHex(header->tc) << Logger::commit << - "Recursion Desired: " << byteToHex(header->rd) << Logger::commit << - "Recursion Available: " << byteToHex(header->ra) << Logger::commit << - "RCode: " << byteToHex(header->rCode) << Logger::commit << - "Question Count: " << intToHex(2, header->qdCount) << Logger::commit << - "Answer Record Count: " << intToHex(2, header->anCount) << Logger::commit << - "Authority Record Count: " << intToHex(2, header->nsCount) << Logger::commit << - "Additional Record Count: " << intToHex(2, header->arCount) << Logger::commit; + _logger.debug << "[Resolver:Server] Header: " << Logger::commit; + //_logger.debug << "[Resolver:Server] ID: " << 0x1ef8 << + _logger.debug << "[Resolver:Server] ID: " << intToHex(2, header->id) << + "[Resolver:Server] QR: " << byteToHex(header->qr) << + "[Resolver:Server] OPCode: " << byteToHex(header->opCode) << Logger::commit << + "[Resolver:Server] Authoritive Answer: " << byteToHex(header->aa) << Logger::commit << + "[Resolver:Server] Truncation Flag: " << byteToHex(header->tc) << Logger::commit << + "[Resolver:Server] Recursion Desired: " << byteToHex(header->rd) << Logger::commit << + "[Resolver:Server] Recursion Available: " << byteToHex(header->ra) << Logger::commit << + "[Resolver:Server] RCode: " << byteToHex(header->rCode) << Logger::commit << + "[Resolver:Server] Question Count: " << intToHex(2, header->qdCount) << Logger::commit << + "[Resolver:Server] Answer Record Count: " << intToHex(2, header->anCount) << Logger::commit << + "[Resolver:Server] Authority Record Count: " << intToHex(2, header->nsCount) << Logger::commit << + "[Resolver:Server] Additional Record Count: " << intToHex(2, header->arCount) << Logger::commit; myfile.close(); //Testing over - _logger.debug << "Done testing" << Logger::commit; + _logger.debug << "[Resolver:Server] Done testing" << Logger::commit; _udpSocket = new udp::socket(_ioContext, udp::endpoint(udp::v4(), 8853)); _ioContext.run(); @@ -70,21 +70,21 @@ Server::Server(EventBus& eventBus) _stop = false; _thread = thread(&Server::run, this); - _logger.debug.ln ("Resolver started"); + _logger.debug.ln ("[Resolver:Server] Resolver started"); } Server::~Server() { - _logger.debug.ln ("Stopping Resolver..."); + _logger.debug.ln ("[Resolver:Server] Stopping Resolver..."); _stop = true; //_udpSocket->close(); _thread.join(); - _logger.debug.ln ("Resolver stopped"); + _logger.debug.ln ("[Resolver:Server] Resolver stopped"); } void Server::run() { //_ioContext.run(); //doReceive(); - _logger.warn.ln ("Hi From resolver thread!"); + _logger.warn.ln ("[Resolver:Server] Hi From resolver thread!"); char msg[] = "Hello to you too!!!\n"; int udpServerSocket, udpReadStatus; @@ -102,12 +102,12 @@ void Server::run() { // Create new UDP Socket if ((udpServerSocket = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - _logger.fatal.ln("socket creation error..."); + _logger.fatal.ln("[Resolver:Server] socket creation error..."); } // Bind UDP Socket if ((bind(udpServerSocket, (struct sockaddr*)&serverAddress, sizeof(serverAddress))) < 0) { - _logger.fatal.ln("binding error..."); + _logger.fatal.ln("[Resolver:Server] binding error..."); } while(!_stop) { @@ -115,7 +115,7 @@ void Server::run() { if (udpServerSocket < 0) { close(udpServerSocket); - _logger.warn.ln("reading error..."); + _logger.warn.ln("[Resolver:Server] reading error..."); } /* @@ -128,18 +128,18 @@ void Server::run() { Message* message = (Message*) &buffer; //Spit out some header values for debugging. - _logger.warn << "ID: " << message->id(); - _logger.warn << " QR: " << message->qr(); - _logger.warn << " OPCode: " << message->opCode(); - _logger.warn << " AA: " << message->aa(); - _logger.warn << " TC: " << message->tc(); - _logger.warn << " RD: " << message->rd(); - _logger.warn << " RA: " << message->ra(); - _logger.warn << " RCode: " << message->rCode(); - _logger.warn << " QDCount: " << message->qdCount(); - _logger.warn << " ANCount: " << message->anCount(); - _logger.warn << " NSCount: " << message->nsCount(); - _logger.warn << " ARCount: " << message->arCount(); + _logger.warn << "[Resolver:Server] ID: " << message->id(); + _logger.warn << "[Resolver:Server] QR: " << message->qr(); + _logger.warn << "[Resolver:Server] OPCode: " << message->opCode(); + _logger.warn << "[Resolver:Server] AA: " << message->aa(); + _logger.warn << "[Resolver:Server] TC: " << message->tc(); + _logger.warn << "[Resolver:Server] RD: " << message->rd(); + _logger.warn << "[Resolver:Server] RA: " << message->ra(); + _logger.warn << "[Resolver:Server] RCode: " << message->rCode(); + _logger.warn << "[Resolver:Server] QDCount: " << message->qdCount(); + _logger.warn << "[Resolver:Server] ANCount: " << message->anCount(); + _logger.warn << "[Resolver:Server] NSCount: " << message->nsCount(); + _logger.warn << "[Resolver:Server] ARCount: " << message->arCount(); _logger.warn << Logger::commit; // Change message to response type and send back for testing @@ -150,7 +150,7 @@ void Server::run() { //if ( sendto(udpServerSocket, msg, strlen(msg), 0, (struct sockaddr*)&clientAddress, clientAddressLength) < 0 ) { if ( sendto(udpServerSocket, message->encode(), message->encodedSize(), 0, (struct sockaddr*)&clientAddress, clientAddressLength) < 0 ) { close(udpServerSocket); - _logger.warn.ln("sending error..."); + _logger.warn.ln("[Resolver:Server] sending error..."); } } diff --git a/src/resolver/include/Server.hpp b/src/resolver/include/Server.hpp index da54b8f..7a18148 100644 --- a/src/resolver/include/Server.hpp +++ b/src/resolver/include/Server.hpp @@ -3,8 +3,6 @@ #include "asio.hpp" #include "Core.hpp" #include -//#include - namespace Plains { namespace Resolver { @@ -14,8 +12,7 @@ using Core::Logger; using Core::Exception; using std::thread; -#define PORT 5355 - +#define PORT 53 class Server diff --git a/src/ui/Server.cpp b/src/ui/Server.cpp index ab9dadd..5722b90 100644 --- a/src/ui/Server.cpp +++ b/src/ui/Server.cpp @@ -12,7 +12,7 @@ Server::Server(EventBus& eventBus) : _logger(Logger::getInstance()), _eventBus(eventBus) { - _logger.debug.ln ("Starting UI Webserver..."); + _logger.info.ln ("[UI:Webserver] starting..."); _server = new httplib::Server; _server->Get("/", [this](const auto& req, auto& res) { @@ -32,23 +32,23 @@ Server::Server(EventBus& eventBus) }); _server->set_logger([this](const auto& req, const auto& res) { - _logger.info << "UI Webserver - " << req.method << " " << req.path << Logger::commit; + _logger.debug << "[UI:Webserver] " << req.method << " " << req.path << Logger::commit; }); _thread = thread(&Server::run, this); - _logger.debug.ln ("UI Webserver started"); + _logger.info.ln ("[UI:Webserver] started"); } Server::~Server() { - _logger.debug.ln ("Stopping UI Webserver..."); + _logger.info.ln ("[UI:Webserver] shutting down..."); _server->stop(); _thread.join(); delete _server; - _logger.debug.ln ("UI Webserver stopped"); + _logger.info.ln ("[UI:Webserver] stopped"); } void Server::run() { - _logger.info.ln ("UI available at http://localhost:3030"); + _logger.info.ln ("[UI:Webserver] now available at http://localhost:3030"); _server->listen("127.0.0.1", 3030); }