sven/plains
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modified: src/core/ConfigManager.cpp

Browse Source 
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
This commit is contained in:
sven committed 2024-06-11 18:35:32 +02:00
1 parent 96d9d364ad
commit d5aeccb576
6 files changed
+65 -68
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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