REBASE 3/5

bfs/include/Logger.hpp

@@ -9,6 +9,7 @@
 #include <time.h>
 #include <chrono>
 #include <ctime>
+#include <windows.h>
 
 using namespace std;
 
@@ -23,11 +24,12 @@ extern class Logger {
 	~Logger();
 	void writeLog(string msg, int msg_level);
 	static Logger* getLogger(Logger* logger);
+	string getPath();
 private:
 	int logging_Level;
 	//auto now;
 
 };
 
-
+static Logger* logger = logger->getLogger(logger);
 #endif

bfs/src/comms/AlgorithmServer.cpp

@@ -1,9 +1,9 @@
 
 #include "AlgorithmServer.hpp"
-#include <Logger.h> 
+#include "Logger.hpp"
 
 
-extern Logger* logger = getLogger(logger);
+//extern Logger* logger = logger->getLogger(logger);
 AlgorithmServer::AlgorithmServer(size_t numClients)
 {
 	this->hThread = NULL;
@@ -68,7 +68,7 @@ void AlgorithmServer::serverThreadRuntime()
 
 	iResult = listen(ListenSocket, SOMAXCONN);
 	if (iResult == SOCKET_ERROR) {
-		logger->write_log("listen failed with error\n", 1);
+		logger->writeLog("listen failed with error\n", 1);
 		printf("listen failed with error: %d\n", WSAGetLastError());
 		closesocket(ListenSocket);
 		WSACleanup();
@@ -79,6 +79,7 @@ void AlgorithmServer::serverThreadRuntime()
 	// Accept a client socket
 	while (continueThread)
 	{
+<<<<<<< HEAD
 <<<<<<< HEAD
 		write_log("Listening for clients...\n", 1, logger->filename, logger);
 		fprintf(stderr, "Listening for clients...\n");
@@ -87,15 +88,18 @@ void AlgorithmServer::serverThreadRuntime()
 		fprintf(stderr, "Hello new client!\n");
 =======
 		logger->write_log("Listening for clients...\n", 1);
+=======
+		logger->writeLog("Listening for clients...\n", 1);
+>>>>>>> Reupload logger changes
 		printf("Listening for clients...\n");
 		ClientSocket = accept(ListenSocket, NULL, NULL);
-		logger->write_log("Hello new client!\n", 1);
+		logger->writeLog("Hello new client!\n", 1);
 		printf("Hello new client!\n");
 >>>>>>> Test log
 		if (ClientSocket == INVALID_SOCKET) {
-			logger->write_log("accept failed with error: ", 1);
-			logger->write_log(std::to_string(WSAGetLastError()), 1);
-			logger->write_log("\n", 1);
+			logger->writeLog("accept failed with error: ", 1);
+			logger->writeLog(std::to_string(WSAGetLastError()), 1);
+			logger->writeLog("\n", 1);
 			printf("accept failed with error: %d\n", WSAGetLastError());
 			AcceptFailures++;
 			if (AcceptFailures >= MAX_ACCEPT_FAILURES)
@@ -134,7 +138,7 @@ void AlgorithmServer::serverThreadRuntime()
 			unlockClientThreadsMutex();
 		}
 		else {
-			logger->write_log("Could not acquire mutex to add new client thread\n", 1);
+			logger->writeLog("Could not acquire mutex to add new client thread\n", 1);
 			printf("Could not acquire mutex to add new client thread\n");
 		}
 	}
@@ -172,9 +176,13 @@ vector<Attribute> AlgorithmServer::getAllIncomingAttributes()
 	}
 	else {
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 		logger->write_log("Could not acquire mutex to add new client thread\n", 1);
 >>>>>>> Test log
+=======
+		logger->writeLog("Could not acquire mutex to add new client thread\n", 1);
+>>>>>>> Reupload logger changes
 		printf("Could not acquire mutex to get incoming attributes.\n");
 	}
 	return newAttribs;

bfs/src/comms/DataSyncThread.cpp

@@ -1,7 +1,9 @@
 //#include <Logger.h>
 #include "DataSyncThread.hpp"
-//include<Logger.h>
+#include "Logger.hpp"
 
+
+//extern Logger* logger = logger->getLogger(logger);
 void DataSyncThread::threadRuntime()
 {
 	threadRunning = true;
@@ -155,6 +157,7 @@ void DataSyncThread::startComms()
 	//write_log("Start comms: ", 1, logger->filename, logger);
 	//write_log(std::to_string(incomingAttributes), 1, logger->filename, logger);
 
+
 	if (!threadRunning)
 	{
 		threadRunning = false;

bfs/src/logging/Logger.cpp

@@ -5,16 +5,23 @@ Logger::Logger(int l_Level) {
 	time_t t = time(0);   // get time now
 	struct tm * now = localtime( & t );
 	char buffer [80];
-	strftime (buffer,80,"%Y-%m-%d %H:%M:%S",now);
+	strftime (buffer,80,"%Y-%m-%d-%Hhr%Mm%Ss",now);
 	std::string str(buffer);
 	this->filename = str + ".log";
-	//cout << filename << "\n";
-	//this->filename = "log.txt";
+	this->filePath = getPath() + this->filename; // Sets location and name of log file
+}
+
+string Logger::getPath() {
+	char buffer[MAX_PATH];
+    GetModuleFileName(NULL, buffer, MAX_PATH); // Get current working directory
+    string::size_type pos = string(buffer).find_last_of("\\/");
+	string::size_type pos2 = string(buffer).substr(0, pos).find_last_of( "\\/" );
+	string logPath = string(buffer).substr(0, pos2) + "\\logs\\";
+    return logPath;
 }
 
 void Logger::writeLog(string msg, int msg_level) {
-	string line;
-	this->logFile.open(this->filename, ios::in);
+	this->logFile.open(this->filePath, ios::app);
 	if (this->logging_Level <= msg_level) {
 		auto now = chrono::system_clock::to_time_t(chrono::system_clock::now());
 		this->logFile << ctime(&now) << "  " << msg << endl;