diff --git a/src/client_backend/.vs/client_backend/v17/.suo b/src/client_backend/.vs/client_backend/v17/.suo index a96ff35..d8289c1 100644 Binary files a/src/client_backend/.vs/client_backend/v17/.suo and b/src/client_backend/.vs/client_backend/v17/.suo differ diff --git a/src/client_backend/.vs/client_backend/v17/Browse.VC.db b/src/client_backend/.vs/client_backend/v17/Browse.VC.db index 0e1040d..007cc7a 100644 Binary files a/src/client_backend/.vs/client_backend/v17/Browse.VC.db and b/src/client_backend/.vs/client_backend/v17/Browse.VC.db differ diff --git a/src/client_backend/client_backend.cpp b/src/client_backend/client_backend.cpp index 31574ef..6610de7 100644 --- a/src/client_backend/client_backend.cpp +++ b/src/client_backend/client_backend.cpp @@ -29,8 +29,7 @@ int main() { //check for tasks in com //check for scheduled tasks //execute tasks - //check_for_com_tasks(MAIN_COM,MAIN_COM_PATH); - log(LOGLEVEL::INFO,"test"); + log(LOGLEVEL::WARN,"test","test2",222); printf("check_from_com:%d\n",check_for_com_tasks(MAIN_COM, MAIN_COM_PATH)); printf("check_from_task:%d\n", check_for_sched_tasks(SCHED,SCHED_PATH)); //unlock_task("tsk1"); else it will only be executed once. but this function has to be called at the end of the task. else it will nvr be executed again. this would be bad :( diff --git a/src/client_backend/log.cpp b/src/client_backend/log.cpp index 56e9bbe..55a3948 100644 --- a/src/client_backend/log.cpp +++ b/src/client_backend/log.cpp @@ -14,7 +14,7 @@ std::string get_loglevel(LOGLEVEL level) { return "UNKNOWN"; } } - +/* template void log(LOGLEVEL level, const std::string& message, Args&&... args) { std::string prefix = get_loglevel(level); @@ -54,6 +54,6 @@ void log(LOGLEVEL level, const std::string& message, Args&&... args) { logFile << logString.c_str(); logFile.close(); } -} +}*/ #endif \ No newline at end of file diff --git a/src/client_backend/log.h b/src/client_backend/log.h index eeec27b..33570e5 100644 --- a/src/client_backend/log.h +++ b/src/client_backend/log.h @@ -15,7 +15,44 @@ enum class LOGLEVEL { std::string get_loglevel(LOGLEVEL level); template -void log(LOGLEVEL level, const std::string& message, Args&&... args); +void log(LOGLEVEL level, const std::string& message, Args&&... args) { + std::string prefix = get_loglevel(level); + std::time_t now = std::time(nullptr); + std::tm tm = *std::localtime(&now); + std::ostringstream logStream; + logStream << std::put_time(&tm, "%Y-%m-%d %H:%M:%S") << " " << prefix << " " << message; + if constexpr (sizeof...(args) > 0) { + ((logStream << ' ' << std::forward(args)), ...); + } + logStream << std::endl; + std::string logString = logStream.str(); + + // Open the file based on log level + std::ofstream logFile; + switch (level) { + case LOGLEVEL::INFO: + logFile.open(INFOFILE, std::ios_base::app); + break; + case LOGLEVEL::WARN: + logFile.open(WARNFILE, std::ios_base::app); + break; + case LOGLEVEL::ERR: + logFile.open(ERRORFILE, std::ios_base::app); + break; + } + + // Write the log to the file + if (logFile.is_open()) { + logFile << logString.c_str(); + logFile.close(); + } + //write the log to the general file + logFile.open(LOGFILE, std::ios_base::app); + if (logFile.is_open()) { + logFile << logString.c_str(); + logFile.close(); + } +} #endif // LOGGER_H diff --git a/src/client_backend/well_known.h b/src/client_backend/well_known.h index 7063056..600e1e3 100644 --- a/src/client_backend/well_known.h +++ b/src/client_backend/well_known.h @@ -1,4 +1,6 @@ #pragma once +#ifndef WELL_KNOWN_H +#define WELL_KNOWN_H #define MAIN_COM "main_com.txt" #define MAIN_COM_PATH "C:\\Program Files\\cyberhex\\com\\main_com.txt" @@ -12,3 +14,4 @@ #define INFOFILE "C:\\Program Files\\cyberhex\\secure\\log\\info.txt" #define WARNFILE "C:\\Program Files\\cyberhex\\secure\\log\\warn.txt" #define ERRORFILE "C:\\Program Files\\cyberhex\\secure\\log\\error.txt" +#endif // !WELL_KNOWN_H \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.ilk b/src/client_backend/x64/Debug/client_backend.ilk new file mode 100644 index 0000000..bc08c72 Binary files /dev/null and b/src/client_backend/x64/Debug/client_backend.ilk differ diff --git a/src/client_backend/x64/Debug/client_backend.log b/src/client_backend/x64/Debug/client_backend.log index a3d3f32..ddde04b 100644 --- a/src/client_backend/x64/Debug/client_backend.log +++ b/src/client_backend/x64/Debug/client_backend.log @@ -1,6 +1,3 @@  Quellen werden auf Modulabhängigkeiten überprüft... client_backend.cpp - log.cpp - Code wird generiert... -client_backend.obj : error LNK2019: Verweis auf nicht aufgelöstes externes Symbol ""void __cdecl log<>(enum LOGLEVEL,class std::basic_string,class std::allocator > const &)" (??$log@$$V@@YAXW4LOGLEVEL@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z)" in Funktion "main". -C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\x64\Debug\client_backend.exe : fatal error LNK1120: 1 nicht aufgelöste Externe + client_backend.vcxproj -> C:\Users\janis\Documents\Projekte_mit_c\ma\ma\src\client_backend\x64\Debug\client_backend.exe diff --git a/src/client_backend/x64/Debug/client_backend.pdb b/src/client_backend/x64/Debug/client_backend.pdb index b1331e3..e121726 100644 Binary files a/src/client_backend/x64/Debug/client_backend.pdb and b/src/client_backend/x64/Debug/client_backend.pdb differ diff --git a/src/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog index 803d55b..2a5653d 100644 Binary files a/src/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog and b/src/client_backend/x64/Debug/client_backend.tlog/CL.command.1.tlog differ diff --git a/src/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog index 202f2f1..c70efe6 100644 Binary files a/src/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog and b/src/client_backend/x64/Debug/client_backend.tlog/CL.read.1.tlog differ diff --git a/src/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog index 911bdfc..fa51746 100644 Binary files a/src/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog and b/src/client_backend/x64/Debug/client_backend.tlog/CL.write.1.tlog differ diff --git a/src/client_backend/x64/Debug/client_backend.tlog/client_backend.write.1u.tlog b/src/client_backend/x64/Debug/client_backend.tlog/client_backend.write.1u.tlog index d072a6f..7c55188 100644 Binary files a/src/client_backend/x64/Debug/client_backend.tlog/client_backend.write.1u.tlog and b/src/client_backend/x64/Debug/client_backend.tlog/client_backend.write.1u.tlog differ diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link-cvtres.read.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link-cvtres.read.1.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link-cvtres.read.1.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link-cvtres.write.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link-cvtres.write.1.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link-cvtres.write.1.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link-rc.read.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link-rc.read.1.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link-rc.read.1.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link-rc.write.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link-rc.write.1.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link-rc.write.1.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link.26080-cvtres.read.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link.26080-cvtres.read.1.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link.26080-cvtres.read.1.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link.26080-cvtres.write.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link.26080-cvtres.write.1.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link.26080-cvtres.write.1.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link.26080-rc.read.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link.26080-rc.read.1.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link.26080-rc.read.1.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link.26080-rc.write.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link.26080-rc.write.1.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link.26080-rc.write.1.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link.26080.read.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link.26080.read.1.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link.26080.read.1.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link.26080.read.2.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link.26080.read.2.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link.26080.read.2.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link.26080.write.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link.26080.write.1.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link.26080.write.1.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link.command.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link.command.1.tlog index c42bdff..ca45d6e 100644 Binary files a/src/client_backend/x64/Debug/client_backend.tlog/link.command.1.tlog and b/src/client_backend/x64/Debug/client_backend.tlog/link.command.1.tlog differ diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link.read.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link.read.1.tlog index 46b134b..adea532 100644 Binary files a/src/client_backend/x64/Debug/client_backend.tlog/link.read.1.tlog and b/src/client_backend/x64/Debug/client_backend.tlog/link.read.1.tlog differ diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link.read.2.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link.read.2.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link.read.2.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link.read.3.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link.read.3.tlog deleted file mode 100644 index 46b134b..0000000 --- a/src/client_backend/x64/Debug/client_backend.tlog/link.read.3.tlog +++ /dev/null @@ -1 +0,0 @@ -ÿþ \ No newline at end of file diff --git a/src/client_backend/x64/Debug/client_backend.tlog/link.write.1.tlog b/src/client_backend/x64/Debug/client_backend.tlog/link.write.1.tlog index 46b134b..c821f5e 100644 Binary files a/src/client_backend/x64/Debug/client_backend.tlog/link.write.1.tlog and b/src/client_backend/x64/Debug/client_backend.tlog/link.write.1.tlog differ diff --git a/src/client_backend/x64/Debug/client_backend.tlog/unsuccessfulbuild b/src/client_backend/x64/Debug/client_backend.tlog/unsuccessfulbuild deleted file mode 100644 index e69de29..0000000 diff --git a/src/client_backend/x64/Debug/vc143.idb b/src/client_backend/x64/Debug/vc143.idb index 44aa172..0fd7777 100644 Binary files a/src/client_backend/x64/Debug/vc143.idb and b/src/client_backend/x64/Debug/vc143.idb differ diff --git a/src/client_backend/x64/Debug/vc143.pdb b/src/client_backend/x64/Debug/vc143.pdb index 597594a..7e7e412 100644 Binary files a/src/client_backend/x64/Debug/vc143.pdb and b/src/client_backend/x64/Debug/vc143.pdb differ