summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2017-06-21 00:46:32 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2017-06-21 00:46:32 +0100
commit83806659dd9b937b5dfbdc9892f247014e86914a (patch)
tree3bfeabc72df97286a919c7badab37aea70397124
parentAdd support for getting the lowest configured log domain for a writer (diff)
downloadicetray-83806659dd9b937b5dfbdc9892f247014e86914a.tar.bz2
icetray-83806659dd9b937b5dfbdc9892f247014e86914a.tar.xz
icetray-83806659dd9b937b5dfbdc9892f247014e86914a.zip
Simplify logger[base] constructor
-rw-r--r--icetray/icetray/logger.cpp8
-rw-r--r--icetray/icetray/logger.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/icetray/icetray/logger.cpp b/icetray/icetray/logger.cpp
index 62ab79b..5ee4937 100644
--- a/icetray/icetray/logger.cpp
+++ b/icetray/icetray/logger.cpp
@@ -11,8 +11,7 @@ INSTANTIATEFACTORY(IceTray::Logging::LogWriter, Ice::Properties *);
namespace IceTray {
namespace Logging {
- LoggerBase::LoggerBase(LogManager * manager, const std::string & domain) :
- logs(manager->getLogsForDomain(domain)),
+ LoggerBase::LoggerBase(const std::string & domain) :
domain(domain)
{
}
@@ -21,7 +20,7 @@ namespace IceTray {
{
}
- Logger::Logger(LogManager * manager, const std::string & domain) : LoggerBase(manager, domain) { }
+ Logger::Logger(const std::string & domain) : LoggerBase(domain) { }
void
Logger::message(LogLevel priority, const std::string & msg) const
@@ -91,7 +90,8 @@ namespace IceTray {
LoggerPtr
LogManager::getLogger(const std::string & domain)
{
- auto logger = LoggerPtr(new Logger(this, domain));
+ auto logger = LoggerPtr(new Logger(domain));
+ logger->logs = getLogsForDomain(domain);
loggers.insert(logger.get());
return logger;
}
diff --git a/icetray/icetray/logger.h b/icetray/icetray/logger.h
index 1cbbdc9..123b760 100644
--- a/icetray/icetray/logger.h
+++ b/icetray/icetray/logger.h
@@ -21,7 +21,7 @@ namespace IceTray {
class DLL_PUBLIC LoggerBase {
public:
- LoggerBase(LogManager *, const std::string & domain);
+ LoggerBase(const std::string & domain);
~LoggerBase();
protected:
@@ -33,7 +33,7 @@ namespace IceTray {
class DLL_PUBLIC Logger : public LoggerBase {
public:
- Logger(LogManager *, const std::string & domain);
+ Logger(const std::string & domain);
void message(LogLevel priority, const std::string & msg) const;
void messagef(LogLevel priority, const char * msgfmt, ...) const __attribute__ ((format (printf, 3, 4)));