diff --git a/src/lib/utils/logger.cpp b/src/lib/utils/logger.cpp index c6708a7a..7921851e 100644 --- a/src/lib/utils/logger.cpp +++ b/src/lib/utils/logger.cpp @@ -66,8 +66,8 @@ int calcLevel(const std::string level) } -LogMessage::LogMessage(const int area, const int level, const std::string text, const Status status) - : m_area(area), m_level(level), m_text(text), m_status(status) +LogMessage::LogMessage(const int area, const int level, const std::string text, const bool run) + : m_area(area), m_level(level), m_text(text), m_run(run) { char time[24]; struct timeval tv; @@ -96,7 +96,7 @@ void* LogSink::run() { while (1) { LogMessage* message = m_queue.remove(); - if (message->getStatus() == LogMessage::End) { + if (message->isRunning() == false) { delete message; while (m_queue.size() == true) { LogMessage* message = m_queue.remove(); @@ -190,7 +190,7 @@ void LogInstance::log(const int area, const int level, const std::string& data, if (vasprintf(&tmp, data.c_str(), ap) != -1) { std::string buffer(tmp); - m_messages.add(new LogMessage(LogMessage(area, level, buffer, LogMessage::Run))); + m_messages.add(new LogMessage(LogMessage(area, level, buffer))); } va_end(ap); @@ -213,9 +213,9 @@ void* LogInstance::run() if (((*iter)->getAreas() & message->getArea() && (*iter)->getLevel() >= message->getLevel()) - && message->getStatus() == LogMessage::Run) { + && message->isRunning() == true) { (*iter)->addMessage(*message); - } else if (message->getStatus() == LogMessage::End) { + } else if (message->isRunning() == false) { (*iter)->addMessage(*message); m_running = false; } @@ -231,6 +231,6 @@ void* LogInstance::run() void LogInstance::stop() { - m_messages.add(new LogMessage(LogMessage(bas, error, "", LogMessage::End))); + m_messages.add(new LogMessage(LogMessage(bas, error, "", false))); usleep(100000); } diff --git a/src/lib/utils/logger.h b/src/lib/utils/logger.h index e91261b8..f8ac4b39 100644 --- a/src/lib/utils/logger.h +++ b/src/lib/utils/logger.h @@ -39,31 +39,27 @@ class LogMessage { public: - enum Status { Run, End }; - - LogMessage(const int area, const int level, const std::string text, const Status status); - - ~LogMessage() {} + LogMessage(const int area, const int level, const std::string text, const bool run=true); LogMessage(const LogMessage& src) : m_area(src.m_area), m_level(src.m_level), m_text(src.m_text), - m_status(src.m_status), m_time(src.m_time) {} + m_run(src.m_run), m_time(src.m_time) {} void operator= (const LogMessage& src) { m_area = src.m_area; m_level = src.m_level; m_text = src.m_text; - m_status = src.m_status; m_time = src.m_time; } + m_run = src.m_run; m_time = src.m_time; } int getArea() const { return (m_area); } int getLevel() const { return(m_level); } std::string getText() const { return (m_text.c_str()); } - Status getStatus() const { return (m_status); } + bool isRunning() const { return (m_run); } std::string getTime() const { return (m_time.c_str()); } private: int m_area; int m_level; std::string m_text; - Status m_status; + bool m_run; std::string m_time; }; @@ -77,8 +73,6 @@ public: LogSink(const int areas, const int level, const Type type, const char* name) : m_areas(areas), m_level(level), m_type(type), m_name(name) {} - virtual ~LogSink() {} - void addMessage(const LogMessage& message); void* run(); @@ -113,8 +107,6 @@ public: : LogSink(areas, level, Console, name), m_instance(++m_numInstance) { this->start(name); } - ~LogConsole() {} - private: const int m_instance; static int m_numInstance; @@ -131,8 +123,6 @@ public: : LogSink(areas, level, Logfile, name), m_filename(filename), m_instance(++m_numInstance) { this->start(name); } - ~LogFile() {} - private: std::string m_filename; const int m_instance;