From e0a0ecd62befe49142a9843c38316d159cd3ce9b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 5 Feb 2020 16:40:49 -0500 Subject: [PATCH] Added write_log commands --- breadcrumbs/src/comms/AlgorithmServer.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/breadcrumbs/src/comms/AlgorithmServer.cpp b/breadcrumbs/src/comms/AlgorithmServer.cpp index 84df34e..5d08e32 100644 --- a/breadcrumbs/src/comms/AlgorithmServer.cpp +++ b/breadcrumbs/src/comms/AlgorithmServer.cpp @@ -1,5 +1,8 @@ #include "AlgorithmServer.hpp" +#include "Logger.h" + +//Logger* logger = getLogger(); AlgorithmServer::AlgorithmServer(size_t numClients) { @@ -17,6 +20,7 @@ AlgorithmServer::~AlgorithmServer() void AlgorithmServer::serverThreadRuntime() { + Logger* logger = getLogger(); int iResult; clientThreadsMutex = CreateMutex(NULL, false, NULL); @@ -65,6 +69,7 @@ void AlgorithmServer::serverThreadRuntime() iResult = listen(ListenSocket, SOMAXCONN); if (iResult == SOCKET_ERROR) { + //write_log("listen failed with error\n", 1, logger->filename, logger); printf("listen failed with error: %d\n", WSAGetLastError()); closesocket(ListenSocket); WSACleanup(); @@ -75,10 +80,17 @@ void AlgorithmServer::serverThreadRuntime() // Accept a client socket while (continueThread) { + Logger* logger = getLogger(); + //logger.filename = "log2.txt"; + write_log("Listening for clients...\n", 1, logger->filename, logger); printf("Listening for clients...\n"); ClientSocket = accept(ListenSocket, NULL, NULL); + write_log("Hello new client!\n", 1, logger->filename, logger); printf("Hello new client!\n"); if (ClientSocket == INVALID_SOCKET) { + write_log("accept failed with error: ", 1, logger->filename, logger); + write_log(std::to_string(WSAGetLastError()), 1, logger->filename, logger); + write_log("\n", 1, logger->filename, logger); printf("accept failed with error: %d\n", WSAGetLastError()); AcceptFailures++; if (AcceptFailures >= MAX_ACCEPT_FAILURES) @@ -115,6 +127,7 @@ void AlgorithmServer::serverThreadRuntime() unlockClientThreadsMutex(); } else { + write_log("Could not acquire mutex to add new client thread\n", 1, logger->filename, logger); printf("Could not acquire mutex to add new client thread\n"); } } @@ -134,6 +147,7 @@ vector* AlgorithmServer::getAllIncomingAttributes() Polls DataSyncThreads for new updates Updates master storage accordingly */ + Logger* logger = getLogger(); vector* newAttribs = new vector; if (lockClientThreadsMutex() == STATUS_WAIT_0) { @@ -145,6 +159,7 @@ vector* AlgorithmServer::getAllIncomingAttributes() unlockClientThreadsMutex(); } else { + write_log("Could not acquire mutex to add new client thread\n", 1, logger->filename, logger); printf("Could not acquire mutex to get incoming attributes.\n"); } return newAttribs;