patrick/plasp
Archived
1
0
Fork 0
Code Issues 12 Releases 8 Activity

Made output and error streams members of the logger.

Browse Source
This commit is contained in:
Patrick Lühne 2016-06-14 15:56:35 +02:00
parent b599670572
commit febef4bed4
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/plasp/utils/Logger.h
View File

@ -3,6 +3,7 @@
#include <string> #include <string>
#include <plasp/utils/LogStream.h>
#include <plasp/utils/Parser.h> #include <plasp/utils/Parser.h>
#include <plasp/utils/ParserException.h> #include <plasp/utils/ParserException.h>
@ -36,6 +37,9 @@ class Logger
Logger(Logger &&other); Logger(Logger &&other);
Logger &operator=(Logger &&other); Logger &operator=(Logger &&other);
LogStream<StandardStream::Out> &outputStream();
LogStream<StandardStream::Err> &errorStream();
void setWarningLevel(WarningLevel warningLevel); void setWarningLevel(WarningLevel warningLevel);
void logError(const std::string &message); void logError(const std::string &message);
@ -43,6 +47,9 @@ class Logger
void logWarning(const Parser &parser, const std::string &message); void logWarning(const Parser &parser, const std::string &message);
private: private:
LogStream<StandardStream::Out> m_outputStream;
LogStream<StandardStream::Err> m_errorStream;
WarningLevel m_warningLevel; WarningLevel m_warningLevel;
}; };

27
src/plasp/utils/Logger.cpp
View File

@ -1,7 +1,6 @@
#include <plasp/utils/Logger.h> #include <plasp/utils/Logger.h>
#include <plasp/utils/Formatting.h> #include <plasp/utils/Formatting.h>
#include <plasp/utils/LogStream.h>
namespace plasp namespace plasp
{ {
@ -55,6 +54,20 @@ Logger &Logger::operator=(Logger &&other)
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
LogStream<StandardStream::Out> &Logger::outputStream()
{
return m_outputStream;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
LogStream<StandardStream::Err> &Logger::errorStream()
{
return m_errorStream;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
void Logger::setWarningLevel(WarningLevel warningLevel) void Logger::setWarningLevel(WarningLevel warningLevel)
{ {
m_warningLevel = warningLevel; m_warningLevel = warningLevel;
@ -64,9 +77,7 @@ void Logger::setWarningLevel(WarningLevel warningLevel)
void Logger::logError(const std::string &message) void Logger::logError(const std::string &message)
{ {
LogStream<StandardStream::Err> stream; m_errorStream
stream
<< Format(Color::Red, FontWeight::Bold) << "error:" << Format(Color::Red, FontWeight::Bold) << "error:"
<< ResetFormat() << " " << ResetFormat() << " "
<< Format(Color::White, FontWeight::Bold) << message << Format(Color::White, FontWeight::Bold) << message
@ -77,9 +88,7 @@ void Logger::logError(const std::string &message)
void Logger::logError(const Parser::Coordinate &coordinate, const std::string &message) void Logger::logError(const Parser::Coordinate &coordinate, const std::string &message)
{ {
LogStream<StandardStream::Err> stream; m_errorStream
stream
<< Format(Color::White, FontWeight::Bold) << coordinate.sectionName << ":" << Format(Color::White, FontWeight::Bold) << coordinate.sectionName << ":"
<< std::to_string(coordinate.row) + ":" + std::to_string(coordinate.column) << ":" << std::to_string(coordinate.row) + ":" + std::to_string(coordinate.column) << ":"
<< ResetFormat() << " " << ResetFormat() << " "
@ -101,9 +110,7 @@ void Logger::logWarning(const Parser &parser, const std::string &message)
const auto coordinate = parser.coordinate(); const auto coordinate = parser.coordinate();
LogStream<StandardStream::Err> stream; m_errorStream
stream
<< Format(Color::White, FontWeight::Bold) << coordinate.sectionName << ":" << Format(Color::White, FontWeight::Bold) << coordinate.sectionName << ":"
<< std::to_string(coordinate.row) + ":" + std::to_string(coordinate.column) << ":" << std::to_string(coordinate.row) + ":" + std::to_string(coordinate.column) << ":"
<< ResetFormat() << " " << ResetFormat() << " "