Skip to content

Commit 3033719

Browse files
committed
Bug fix & add wrapper functions
1 parent c6202c1 commit 3033719

File tree

6 files changed

+38
-16
lines changed

6 files changed

+38
-16
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.25)
2-
project(logger)
2+
project(ssbl)
33
set(CMAKE_CXX_STANDARD 20)
44

55
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/out/lib/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_BUILD_TYPE})

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ Logger logger;
2323
logger.SetConfig(Config::All);
2424

2525
// Log levels
26-
logger.Log(Level::Info) << "Hello, Info!\n";
27-
logger.Log(Level::Warning) << "Hello, Warning!\n";
28-
logger.Log(Level::Error) << "Hello, Error!\n";
29-
logger.Log(Level::Fatal) << "Hello, Fatal!\n";
26+
logger.Log() << "Hello, Info!\n";
27+
logger.LogWarn() << "Hello, Warning!\n";
28+
logger.LogError() << "Hello, Error!\n";
29+
logger.LogFatal() << "Hello, Fatal!\n";
3030

3131
// Formatted output
32-
logger.Log(Level::Info) << "My name is {}, and I am {} years old." << "John" << 35 << '\n';
33-
logger.Log(Level::Info) << "{2}, {1}!" << "World" << "Hello" << '\n';
32+
logger.Log() << "My name is {}, and I am {} years old." << "John" << 35 << '\n';
33+
logger.Log() << "{2}, {1}!" << "World" << "Hello" << '\n';
3434

3535
// File output
3636
logger.LogToFile("Example.log") << "Hello, File!\n";

include/Logger.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ namespace SSBL {
1010
class Logger {
1111
public:
1212
Logger &Log(Level level = Level::Info);
13+
Logger &LogWarn();
14+
Logger &LogError();
15+
Logger &LogFatal();
16+
1317
Logger &LogToFile(const std::string &filePath, Level level = Level::Info);
1418

1519
template<typename T>

include/logger.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ namespace SSBL {
1010
class Logger {
1111
public:
1212
Logger &Log(Level level = Level::Info);
13+
Logger &LogWarn();
14+
Logger &LogError();
15+
Logger &LogFatal();
16+
1317
Logger &LogToFile(const std::string &filePath, Level level = Level::Info);
1418

1519
template<typename T>

src/Logger.cpp

+17-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,21 @@
1111
namespace SSBL {
1212

1313
Logger &Logger::Log(const Level level) {
14-
m_level = level;
15-
return *this;
14+
m_level = level;
15+
return *this;
16+
}
17+
Logger &Logger::LogWarn() {
18+
return Log(Level::Warning);
19+
}
20+
21+
Logger &Logger::LogError() {
22+
return Log(Level::Error);
23+
}
24+
25+
Logger &Logger::LogFatal() {
26+
return Log(Level::Fatal);
1627
}
28+
1729
Logger &Logger::LogToFile(const std::string &filePath, Level level) {
1830
m_level = level;
1931
m_fileOutStream = std::ofstream(filePath);
@@ -74,7 +86,8 @@ void Logger::SetColor() {
7486
#if _WIN32
7587
SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), GetColor());
7688
#else
77-
*m_msgOutStream << GetColor();
89+
*m_errOutStream << GetColor();
90+
*m_msgOutStream << GetColor();
7891
#endif
7992
}
8093

@@ -83,6 +96,7 @@ void Logger::ResetColor() const {
8396
SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), 0x0F);
8497
#else
8598
*m_msgOutStream << "\033[0m";
99+
*m_errOutStream << "\033[0m";
86100
#endif
87101
}
88102

src/example/example.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ int main() {
77
logger.SetConfig(Config::All);
88

99
// Log levels
10-
logger.Log(Level::Info) << "Hello, Info!\n";
11-
logger.Log(Level::Warning) << "Hello, Warning!\n";
12-
logger.Log(Level::Error) << "Hello, Error!\n";
13-
// logger.Log(Level::Fatal) << "Hello, Fatal!\n";
10+
logger.Log() << "Hello, Info!\n";
11+
logger.LogWarn() << "Hello, Warning!\n";
12+
logger.LogError() << "Hello, Error!\n";
13+
// logger.LogFatal() << "Hello, Fatal!\n";
1414
// ^ Try and uncomment this
1515

1616
// Formatted output
17-
logger.Log(Level::Info) << "My name is {}, and I am {} years old." << "John" << 35 << '\n';
18-
logger.Log(Level::Info) << "{2}, {1}!" << "World" << "Hello" << '\n';
17+
logger.Log() << "My name is {}, and I am {} years old." << "John" << 35 << '\n';
18+
logger.Log() << "{2}, {1}!" << "World" << "Hello" << '\n';
1919

2020
// File output
2121
logger.LogToFile("Example.log") << "Hello, File!\n";

0 commit comments

Comments
 (0)