src: cleaned logger code

This commit is contained in:
mlangkabel
2018-07-10 11:52:22 +02:00
parent ad325ac974
commit 58eb994a60
7 changed files with 16 additions and 29 deletions
+2 -4
View File
@@ -7,10 +7,6 @@ ConsoleLogger::ConsoleLogger()
{
}
ConsoleLogger::~ConsoleLogger()
{
}
void ConsoleLogger::logInfo(const LogMessage& message)
{
logMessage("INFO", message);
@@ -28,6 +24,8 @@ void ConsoleLogger::logError(const LogMessage& message)
void ConsoleLogger::logMessage(const std::string& type, const LogMessage& message)
{
std::lock_guard<std::mutex> lock(m_consoleMutex);
std::cout << message.getTimeString("%H:%M:%S") << " | ";
if (!message.filePath.empty())
+7 -4
View File
@@ -1,6 +1,8 @@
#ifndef CONSOLE_LOGGER_H
#define CONSOLE_LOGGER_H
#include <mutex>
#include "utility/logging/Logger.h"
#include "utility/logging/LogMessage.h"
@@ -8,14 +10,15 @@ class ConsoleLogger: public Logger
{
public:
ConsoleLogger();
~ConsoleLogger();
private:
virtual void logInfo(const LogMessage& message);
virtual void logWarning(const LogMessage& message);
virtual void logError(const LogMessage& message);
void logInfo(const LogMessage& message) override;
void logWarning(const LogMessage& message) override;
void logError(const LogMessage& message) override;
void logMessage(const std::string& type, const LogMessage& message);
std::mutex m_consoleMutex;
};
#endif // CONSOLE_LOGGER_H
-4
View File
@@ -48,10 +48,6 @@ FileLogger::FileLogger()
updateLogFileName();
}
FileLogger::~FileLogger()
{
}
FilePath FileLogger::getLogFilePath() const
{
return m_currentLogFilePath;
+3 -4
View File
@@ -13,7 +13,6 @@ public:
static std::wstring generateDatedFileName(const std::wstring& prefix = L"", const std::wstring& suffix = L"");
FileLogger();
virtual ~FileLogger();
FilePath getLogFilePath() const;
void setLogFilePath(const FilePath& filePath);
@@ -26,9 +25,9 @@ public:
void setMaxLogFileCount(unsigned int amount);
private:
virtual void logInfo(const LogMessage& message);
virtual void logWarning(const LogMessage& message);
virtual void logError(const LogMessage& message);
void logInfo(const LogMessage& message) override;
void logWarning(const LogMessage& message) override;
void logError(const LogMessage& message) override;
void logMessage(const std::string& type, const LogMessage& message);
void updateLogFileName();
-4
View File
@@ -6,10 +6,6 @@ Logger::Logger(const std::string& type)
{
}
Logger::~Logger()
{
}
std::string Logger::getType() const
{
return m_type;
+1 -1
View File
@@ -19,7 +19,7 @@ public:
};
Logger(const std::string& type);
virtual ~Logger();
virtual ~Logger() = default;
std::string getType() const;
+3 -8
View File
@@ -198,7 +198,6 @@ private:
{
public:
TestLogger();
~TestLogger();
void reset();
int getMessageCount() const;
@@ -210,9 +209,9 @@ private:
std::wstring getLastError() const;
private:
void logInfo(const LogMessage& message);
void logWarning(const LogMessage& message);
void logError(const LogMessage& message);
void logInfo(const LogMessage& message) override;
void logWarning(const LogMessage& message) override;
void logError(const LogMessage& message) override;
int m_logMessageCount;
int m_logWarningCount;
@@ -236,10 +235,6 @@ LogManagerTestSuite::TestLogger::TestLogger()
{
}
LogManagerTestSuite::TestLogger::~TestLogger()
{
}
void LogManagerTestSuite::TestLogger::reset()
{
m_logMessageCount = 0;