summaryrefslogtreecommitdiff
path: root/i/marvin/src/log/log_message.cc
diff options
context:
space:
mode:
Diffstat (limited to 'i/marvin/src/log/log_message.cc')
-rw-r--r--i/marvin/src/log/log_message.cc29
1 files changed, 9 insertions, 20 deletions
diff --git a/i/marvin/src/log/log_message.cc b/i/marvin/src/log/log_message.cc
index 4443e13..4305374 100644
--- a/i/marvin/src/log/log_message.cc
+++ b/i/marvin/src/log/log_message.cc
@@ -27,32 +27,24 @@
#include <iostream>
/// Constructeur.
-LogMessage::LogMessage (const Log &log, const char *msg, Log::Level level)
+LogMessage::LogMessage (const Log &log, Logger &logger, const char *msg,
+ Log::Level level)
+: logger_ (logger)
{
- writeAllowed_ = level <= log.getLevel();
-
- if(writeAllowed_)
- {
- *Log::getOstLog() << log.getModule () << ':';
- if (log.getInstance ())
- *Log::getOstLog() << ' ' << log.getInstance () << ':';
- *Log::getOstLog() << ' ' << msg;
- }
+ logger_.start (log, msg, level);
}
/// Destructeur.
LogMessage::~LogMessage (void)
{
- if(writeAllowed_)
- *Log::getOstLog() << std::endl;
+ logger_.stop ();
}
/// Output a string or a variable name.
LogMessage &
LogMessage::operator<< (const char *s)
{
- if(writeAllowed_)
- *Log::getOstLog() << ' ' << s;
+ logger_ << s;
return *this;
}
@@ -60,8 +52,7 @@ LogMessage::operator<< (const char *s)
LogMessage &
LogMessage::operator<< (const std::string &s)
{
- if(writeAllowed_)
- *Log::getOstLog() << ' ' << s;
+ logger_ << s;
return *this;
}
@@ -69,8 +60,7 @@ LogMessage::operator<< (const std::string &s)
LogMessage &
LogMessage::operator<< (int i)
{
- if(writeAllowed_)
- *Log::getOstLog() << ' ' << i;
+ logger_ << i;
return *this;
}
@@ -78,8 +68,7 @@ LogMessage::operator<< (int i)
LogMessage &
LogMessage::operator<< (double d)
{
- if(writeAllowed_)
- *Log::getOstLog() << ' ' << d;
+ logger_ << d;
return *this;
}