Mirror/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-10-02 11:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x

Browse Source
This commit is contained in:
gabime
2019-07-05 10:45:24 +03:00
parent 90dd56b839 d1794f4c1b
commit 517ccc4088
23 changed files with 270 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/spdlog/sinks/ansicolor_sink-inl.h
View File

@@ -7,6 +7,7 @@
#include "spdlog/sinks/ansicolor_sink.h"
#endif
#include "spdlog/details/pattern_formatter.h"
#include "spdlog/details/os.h"
namespace spdlog {
@@ -132,4 +133,4 @@ SPDLOG_INLINE ansicolor_stderr_sink<ConsoleMutex>::ansicolor_stderr_sink(color_m
{}
} // namespace sinks
} // namespace spdlog
} // namespace spdlog

10
include/spdlog/sinks/daily_file_sink.h
View File

@@ -67,10 +67,14 @@ public:
protected:
void sink_it_(const details::log_msg &msg) override
{
if (msg.time >= rotation_tp_)
#ifdef SPDLOG_NO_DATETIME
auto time = log_clock::now();
#else
auto time = msg.time;
#endif
if (time >= rotation_tp_)
{
file_helper_.open(FileNameCalc::calc_filename(base_filename_, now_tm(msg.time)), truncate_);
file_helper_.open(FileNameCalc::calc_filename(base_filename_, now_tm(time)), truncate_);
rotation_tp_ = next_rotation_tp_();
}
fmt::memory_buffer formatted;