This commit is contained in:
gabime 2014-11-01 02:28:49 +02:00
parent 1c7b3e4eb2
commit e8403e17df
11 changed files with 42 additions and 25 deletions

View File

@ -32,7 +32,8 @@ int main(int argc, char* argv[])
int file_size = 30 * 1024 * 1024;
int rotating_files = 5;
try {
try
{
if(argc > 1)
howmany = atoi(argv[1]);
@ -49,7 +50,7 @@ int main(int argc, char* argv[])
auto daily_st = spdlog::daily_logger_st("daily_st", "logs/daily_st", flush_interval);
bench(howmany, daily_st);
bench(howmany, spdlog::create<null_sink_st>("null_st"));
cout << "\n*******************************************************************************\n";
@ -100,7 +101,8 @@ void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count
auto start = system_clock::now();
for (int t = 0; t < thread_count; ++t)
{
threads.push_back(std::thread([&]() {
threads.push_back(std::thread([&]()
{
while (true)
{
int counter = ++msg_counter;

View File

@ -31,10 +31,11 @@ int main(int, char* [])
spd::set_level(spd::level::WARN);
console->info("This should not be displayed");
console->warn("This should!");
spd::set_level(spd::level::INFO);
// Change format pattern to all loggers
spd::set_pattern(" **** %Y-%m-%d %H:%M:%S.%e %l **** %v");
spd::get("console")->warn("This is another message with different format");
spd::get("console")->info("This is another message with different format");
}
catch (const spd::spdlog_ex& ex)
{

View File

@ -6,7 +6,8 @@
namespace spdlog
{
class formatter;
namespace sinks {
namespace sinks
{
class sink;
}
@ -45,7 +46,8 @@ class spdlog_ex : public std::exception
{
public:
spdlog_ex(const std::string& msg) :_msg(msg) {};
const char* what() const throw() override {
const char* what() const throw() override
{
return _msg.c_str();
}
private:

View File

@ -5,10 +5,13 @@
//Source: http://stackoverflow.com/a/4351484/192001
//Modified version to pad zeros according to padding arg
namespace spdlog {
namespace details {
namespace spdlog
{
namespace details
{
const char digit_pairs[201] = {
const char digit_pairs[201] =
{
"00010203040506070809"
"10111213141516171819"
"20212223242526272829"

View File

@ -43,7 +43,8 @@ inline spdlog::formatter_ptr spdlog::logger::get_formatter() const
template <typename... Args>
inline spdlog::details::line_logger spdlog::logger::log(level::level_enum lvl, const Args&... args) {
inline spdlog::details::line_logger spdlog::logger::log(level::level_enum lvl, const Args&... args)
{
bool msg_enabled = should_log(lvl);
details::line_logger l(this, lvl, msg_enabled);
if (msg_enabled)
@ -52,7 +53,8 @@ inline spdlog::details::line_logger spdlog::logger::log(level::level_enum lvl, c
}
template <typename... Args>
inline spdlog::details::line_logger spdlog::logger::log(const Args&... args) {
inline spdlog::details::line_logger spdlog::logger::log(const Args&... args)
{
return log(level::ALWAYS, args...);
}

View File

@ -2,8 +2,10 @@
// null, no cost mutex
namespace spdlog {
namespace details {
namespace spdlog
{
namespace details
{
struct null_mutex
{
void lock() {}

View File

@ -13,7 +13,8 @@
namespace spdlog
{
namespace details {
namespace details
{
class flag_formatter
{
public:
@ -23,7 +24,8 @@ public:
///////////////////////////////////////////////////////////////////////
// name & level pattern appenders
///////////////////////////////////////////////////////////////////////
namespace {
namespace
{
class name_formatter :public flag_formatter
{
void format(details::log_msg& msg) override
@ -425,7 +427,7 @@ inline void spdlog::pattern_formatter::handle_flag(char flag)
{
switch (flag)
{
// logger name
// logger name
case 'n':
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::name_formatter()));
break;

View File

@ -11,10 +11,13 @@
#include "../logger.h"
#include "../common.h"
namespace spdlog {
namespace details {
namespace spdlog
{
namespace details
{
class registry {
class registry
{
public:
std::shared_ptr<logger> get(const std::string& logger_name)
{

View File

@ -57,9 +57,6 @@ inline std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st(const std::strin
}
inline std::shared_ptr<spdlog::logger> spdlog::create(const std::string& logger_name, spdlog::sinks_init_list sinks)
{
return details::registry::instance().create(logger_name, sinks);

View File

@ -3,7 +3,8 @@
#include "details/log_msg.h"
namespace spdlog
{
namespace details {
namespace details
{
class flag_formatter;
}

View File

@ -4,8 +4,10 @@
#include "../details/null_mutex.h"
namespace spdlog {
namespace sinks {
namespace spdlog
{
namespace sinks
{
template <class Mutex>
class null_sink : public base_sink<Mutex>