From e62001bcf6658e05bbe2bde8a5c59a234c5395c3 Mon Sep 17 00:00:00 2001 From: Nicholas Chan Date: Tue, 11 Feb 2020 13:36:06 -0500 Subject: [PATCH] Postponing logger info --- breadcrumbs/config/config.txt | 1 + breadcrumbs/include/Logger.h | 13 ++++++++++--- breadcrumbs/src/comms/AlgorithmServer.cpp | 7 ++----- breadcrumbs/src/comms/DataSyncThread.cpp | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 breadcrumbs/config/config.txt diff --git a/breadcrumbs/config/config.txt b/breadcrumbs/config/config.txt new file mode 100644 index 0000000..8ec0225 --- /dev/null +++ b/breadcrumbs/config/config.txt @@ -0,0 +1 @@ +int i = 0 \ No newline at end of file diff --git a/breadcrumbs/include/Logger.h b/breadcrumbs/include/Logger.h index d513e1d..de4420c 100644 --- a/breadcrumbs/include/Logger.h +++ b/breadcrumbs/include/Logger.h @@ -1,5 +1,5 @@ -#ifndef LOGGER_HPP -#define LOGGER_HPP +#ifndef LOGGER_H +#define LOGGER_H #include #include @@ -11,7 +11,7 @@ using namespace std; -class Logger { +extern class Logger { public: int logging_Level = 1; string filename = "log.txt"; @@ -19,6 +19,13 @@ class Logger { }; +void start_log(string filename){ + ofstream log_file; + log_file.open(filename, std::ios_base::in | std::ios_base::trunc); + log_file << "Start log"; + log_file.close(); +} + void write_log(string msg, int msg_level, string filename, Logger* logObject) { string line; ofstream log_file; diff --git a/breadcrumbs/src/comms/AlgorithmServer.cpp b/breadcrumbs/src/comms/AlgorithmServer.cpp index 5d08e32..3a81708 100644 --- a/breadcrumbs/src/comms/AlgorithmServer.cpp +++ b/breadcrumbs/src/comms/AlgorithmServer.cpp @@ -1,8 +1,7 @@ #include "AlgorithmServer.hpp" -#include "Logger.h" +#include -//Logger* logger = getLogger(); AlgorithmServer::AlgorithmServer(size_t numClients) { @@ -20,7 +19,7 @@ AlgorithmServer::~AlgorithmServer() void AlgorithmServer::serverThreadRuntime() { - Logger* logger = getLogger(); + //Logger* logger = getLogger(); int iResult; clientThreadsMutex = CreateMutex(NULL, false, NULL); @@ -80,8 +79,6 @@ 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); diff --git a/breadcrumbs/src/comms/DataSyncThread.cpp b/breadcrumbs/src/comms/DataSyncThread.cpp index fb86574..a999136 100644 --- a/breadcrumbs/src/comms/DataSyncThread.cpp +++ b/breadcrumbs/src/comms/DataSyncThread.cpp @@ -1,6 +1,6 @@ - +//#include #include "DataSyncThread.hpp" -#include +//include void DataSyncThread::threadRuntime() {