TeaSpeak
/
spdlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/gabime/spdlog

This commit is contained in:
gabime 2016-05-15 01:45:37 +03:00
parent 80a432e646 58699a2bd4
commit 9a9e9aace9
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/spdlog/details/async_logger_impl.h
View File

@ -49,7 +49,7 @@ inline spdlog::async_logger::async_logger(const std::string& logger_name,
async_logger(logger_name, async_logger(logger_name,
{ {
single_sink single_sink
}, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {} }, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {}
inline void spdlog::async_logger::flush() inline void spdlog::async_logger::flush()

2
include/spdlog/details/pattern_formatter_impl.h
View File

@ -619,7 +619,7 @@ inline void spdlog::pattern_formatter::format(details::log_msg& msg)
f->format(msg, tm_time); f->format(msg, tm_time);
} }
//write eol //write eol
msg.formatted.write(details::os::eol, details::os::eol_size); msg.formatted.write(details::os::eol, details::os::eol_size);
} }
catch(const fmt::FormatError& e) catch(const fmt::FormatError& e)
{ {

8
tests/file_log.cpp
View File

@ -80,8 +80,8 @@ TEST_CASE("daily_logger", "[daily_logger]]")
TEST_CASE("daily_logger with dateonly calculator", "[daily_logger_dateonly]]") TEST_CASE("daily_logger with dateonly calculator", "[daily_logger_dateonly]]")
{ {
using sink_type = spdlog::sinks::daily_file_sink< using sink_type = spdlog::sinks::daily_file_sink<
std::mutex, std::mutex,
spdlog::sinks::dateonly_daily_file_name_calculator>; spdlog::sinks::dateonly_daily_file_name_calculator>;
prepare_logdir(); prepare_logdir();
//calculate filename (time based) //calculate filename (time based)
@ -112,8 +112,8 @@ struct custom_daily_file_name_calculator
TEST_CASE("daily_logger with custom calculator", "[daily_logger_custom]]") TEST_CASE("daily_logger with custom calculator", "[daily_logger_custom]]")
{ {
using sink_type = spdlog::sinks::daily_file_sink< using sink_type = spdlog::sinks::daily_file_sink<
std::mutex, std::mutex,
custom_daily_file_name_calculator>; custom_daily_file_name_calculator>;
prepare_logdir(); prepare_logdir();
//calculate filename (time based) //calculate filename (time based)