nice logger api improvement

This commit is contained in:
gabime 2014-03-31 02:09:13 +03:00
parent ff824cdb5a
commit 9e1ba5167a
3 changed files with 54 additions and 36 deletions

View File

@ -21,7 +21,8 @@ int main(int argc, char* argv[])
const unsigned int howmany = argc <= 1 ? 1000000:atoi(argv[1]); const unsigned int howmany = argc <= 1 ? 1000000:atoi(argv[1]);
logger cout_logger ("", sinks::stdout_sink()); logger cout_logger ("", sinks::stdout_sink());
cout_logger.info() << "Hello " << "man"; cout_logger.info("Hello ") << "man" << 123 << " : " << 0.45f;
cout_logger.info("This is very nice! ") << "Yes gabi.." << ":)";
auto fsink = std::make_shared<sinks::rotating_file_sink>("log", "txt", 1024*1024*50 , 5, 0); auto fsink = std::make_shared<sinks::rotating_file_sink>("log", "txt", 1024*1024*50 , 5, 0);
auto nullsink = sinks::null_sink::get(); auto nullsink = sinks::null_sink::get();
@ -32,16 +33,16 @@ int main(int argc, char* argv[])
auto start = system_clock::now(); auto start = system_clock::now();
for(unsigned int i = 1; i <= howmany ; ++i) for(unsigned int i = 1; i <= howmany ; ++i)
my_logger.info() << "Hello logger: "; my_logger.info("Hello logger: ");
//auto s = howmany - as->q().size(); //auto s = howmany - as->q().size();
auto s = howmany; auto s = howmany;
auto delta = system_clock::now() - start; auto delta = system_clock::now() - start;
auto delta_d = duration_cast<duration<double>> (delta).count(); auto delta_d = duration_cast<duration<double>> (delta).count();
cout_logger.info() << "Total:" << format(s); cout_logger.info("Total:") << format(s);
cout_logger.info() << "Delta:" << format(delta_d); cout_logger.info("Delta:") << format(delta_d);
cout_logger.info() << "Rate:" << format(s/delta_d) << "/sec"; cout_logger.info("Rate:") << format(s/delta_d) << "/sec";
return 0; return 0;
} }

View File

@ -58,17 +58,25 @@ public:
} }
} }
template<typename T> template<typename T>
line_logger& operator<<(const T& what) void write(const T& what)
{ {
if (_enabled) if (_enabled)
{ {
_oss << what; _oss << what;
_empty = false; _empty = false;
} }
}
template<typename T>
line_logger& operator<<(const T& what)
{
write(what);
return *this; return *this;
} }
private: private:
logger* _callback_logger; logger* _callback_logger;
log_msg _log_msg; log_msg _log_msg;

View File

@ -49,15 +49,14 @@ public:
const std::string& get_name() const; const std::string& get_name() const;
bool should_log(c11log::level::level_enum) const; bool should_log(c11log::level::level_enum) const;
details::line_logger log(level::level_enum); template<typename T> details::line_logger debug(const T&);
details::line_logger debug(); template<typename T> details::line_logger info(const T&);
details::line_logger info(); template<typename T> details::line_logger warn(const T&);
details::line_logger warn(); template<typename T> details::line_logger error(const T&);
details::line_logger error(); template<typename T> details::line_logger critical(const T&);
details::line_logger critical(); template<typename T> details::line_logger fatal(const T&);
details::line_logger fatal();
private: private:
friend details::line_logger; friend details::line_logger;
@ -71,6 +70,8 @@ private:
}; };
//Get from loggers pool if exists with such name
logger& get_logger(const std::string& name); logger& get_logger(const std::string& name);
} }
@ -97,38 +98,46 @@ inline c11log::logger::logger(const std::string& name, sink_ptr sink, formatter_
logger(name, {sink}, f) {} logger(name, {sink}, f) {}
inline c11log::details::line_logger c11log::logger::log(c11log::level::level_enum msg_level)
template<typename T>
inline c11log::details::line_logger c11log::logger::debug(const T& msg)
{ {
return details::line_logger(this, msg_level, msg_level >= _min_level); details::line_logger l(this, level::DEBUG, should_log(level::DEBUG));
l.write(msg);
return l;
} }
inline c11log::details::line_logger c11log::logger::debug() template<typename T>
inline c11log::details::line_logger c11log::logger::info(const T& msg)
{ {
return details::line_logger(this, level::DEBUG, should_log(level::DEBUG)); details::line_logger l(this, level::INFO, should_log(level::INFO));
} l.write(msg);
inline c11log::details::line_logger c11log::logger::info() return l;
{
return details::line_logger(this, level::INFO, should_log(level::INFO));
}
inline c11log::details::line_logger c11log::logger::warn()
{
return details::line_logger(this, level::WARNING, should_log(level::WARNING));
}
inline c11log::details::line_logger c11log::logger::error()
{
return details::line_logger(this, level::ERROR, should_log(level::ERROR));
} }
inline c11log::details::line_logger c11log::logger::critical() template<typename T>
inline c11log::details::line_logger c11log::logger::warn(const T& msg)
{ {
return details::line_logger(this, level::CRITICAL, should_log(level::CRITICAL)); details::line_logger l(this, level::WARNING, should_log(level::WARNING));
l.write(msg);
return l;
} }
inline c11log::details::line_logger c11log::logger::fatal() template<typename T>
inline c11log::details::line_logger c11log::logger::critical(const T& msg)
{ {
return details::line_logger(this, level::FATAL, should_log(level::FATAL)); details::line_logger l(this, level::CRITICAL, should_log(level::CRITICAL));
l.write(msg);
return l;
} }
template<typename T>
inline c11log::details::line_logger c11log::logger::fatal(const T& msg)
{
details::line_logger l(this, level::FATAL, should_log(level::FATAL));
l.write(msg);
return l;
}
inline const std::string& c11log::logger::get_name() const inline const std::string& c11log::logger::get_name() const
{ {