From 7c1154413c2a061ce0937722065b516dcbc3be40 Mon Sep 17 00:00:00 2001 From: Alfred Burgess <alfred.burgess95@gmail.com> Date: Tue, 19 Dec 2023 20:50:51 +0800 Subject: [PATCH] Implemented required changes for einows --- include/logger.h | 2 +- src/logger.cpp | 6 +++--- src/main.cpp | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/logger.h b/include/logger.h index 9e99839..333e5bd 100644 --- a/include/logger.h +++ b/include/logger.h @@ -13,7 +13,7 @@ enum LogLevel { - DEBUG, INFO, WARNING, ERROR, FATAL + DEBUG, INFO, WARNING, ERR, FATAL }; class Logger diff --git a/src/logger.cpp b/src/logger.cpp index bcff28d..81acf6a 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -11,7 +11,7 @@ void Logger::setLogLevel( LogLevel level ) void Logger::debug( const std::string& message ) { this->log( LogLevel::DEBUG, message ); } void Logger::info( const std::string& message ) { this->log( LogLevel::INFO, message ); } void Logger::warning( const std::string& message ) { this->log( LogLevel::WARNING, message ); } -void Logger::error( const std::string& message ) { this->log( LogLevel::ERROR, message ); } +void Logger::error( const std::string& message ) { this->log( LogLevel::ERR, message ); } void Logger::fatal( const std::string& message ) { this->log( LogLevel::FATAL, message ); } Logger::Logger() @@ -35,7 +35,7 @@ std::string Logger::logLevelToString( LogLevel level ) case LogLevel::DEBUG: return "DEBUG"; case LogLevel::INFO: return "INFO"; case LogLevel::WARNING: return "WARNING"; - case LogLevel::ERROR: return "ERROR"; + case LogLevel::ERR: return "ERROR"; case LogLevel::FATAL: return "FATAL"; default: return "UNKNOWN"; } @@ -47,7 +47,7 @@ std::string Logger::getLevelColour( LogLevel level ) case LogLevel::DEBUG: return BLK; case LogLevel::INFO: return CYN; case LogLevel::WARNING: return YEL; - case LogLevel::ERROR: return RED; + case LogLevel::ERR: return RED; case LogLevel::FATAL: return MAG; default: return CRESET; } diff --git a/src/main.cpp b/src/main.cpp index 5b0ceb7..06ff1c9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -59,6 +59,11 @@ int main( int argc, char* argv[] ) { logger.info( "Process Ending" ); return 0; } -// int /*WINAPI*/ WinMain(/*HINSTANCE hInstance, HINSTANCE, LPSTR, int*/) { main(); return 0; } + +#else // __TEST_RUNNER__ +//int /*WINAPI*/ WinMain(/*HINSTANCE hInstance, HINSTANCE, LPSTR, int*/) { +// main( 0, nullptr ); +// return 0; +//} #endif // __TEST_RUNNER__ -- GitLab