mirror of
https://github.com/gabime/spdlog.git
synced 2024-12-26 02:21:34 +08:00
Fixed daily sink syntax error and redundant file close
This commit is contained in:
parent
53830726b4
commit
31a011e67c
@ -30,12 +30,10 @@
|
|||||||
#include "../details/file_helper.h"
|
#include "../details/file_helper.h"
|
||||||
#include "../details/format.h"
|
#include "../details/format.h"
|
||||||
|
|
||||||
|
|
||||||
namespace spdlog
|
namespace spdlog
|
||||||
{
|
{
|
||||||
namespace sinks
|
namespace sinks
|
||||||
{
|
{
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Trivial file sink with single file as target
|
* Trivial file sink with single file as target
|
||||||
*/
|
*/
|
||||||
@ -82,7 +80,6 @@ public:
|
|||||||
_file_helper.open(calc_filename(_base_filename, 0, _extension));
|
_file_helper.open(calc_filename(_base_filename, 0, _extension));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void _sink_it(const details::log_msg& msg) override
|
void _sink_it(const details::log_msg& msg) override
|
||||||
{
|
{
|
||||||
@ -95,7 +92,6 @@ protected:
|
|||||||
_file_helper.write(msg);
|
_file_helper.write(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static std::string calc_filename(const std::string& filename, std::size_t index, const std::string& extension)
|
static std::string calc_filename(const std::string& filename, std::size_t index, const std::string& extension)
|
||||||
{
|
{
|
||||||
@ -107,14 +103,12 @@ private:
|
|||||||
return w.str();
|
return w.str();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Rotate files:
|
// Rotate files:
|
||||||
// log.txt -> log.1.txt
|
// log.txt -> log.1.txt
|
||||||
// log.1.txt -> log2.txt
|
// log.1.txt -> log2.txt
|
||||||
// log.2.txt -> log3.txt
|
// log.2.txt -> log3.txt
|
||||||
// log.3.txt -> delete
|
// log.3.txt -> delete
|
||||||
|
|
||||||
|
|
||||||
void _rotate()
|
void _rotate()
|
||||||
{
|
{
|
||||||
_file_helper.close();
|
_file_helper.close();
|
||||||
@ -169,17 +163,15 @@ public:
|
|||||||
{
|
{
|
||||||
if (rotation_hour < 0 || rotation_hour > 23 || rotation_minute < 0 || rotation_minute > 59)
|
if (rotation_hour < 0 || rotation_hour > 23 || rotation_minute < 0 || rotation_minute > 59)
|
||||||
throw spdlog_ex("daily_file_sink: Invalid rotation time in ctor");
|
throw spdlog_ex("daily_file_sink: Invalid rotation time in ctor");
|
||||||
_rotation_tp = _next_rotation_tp(),
|
_rotation_tp = _next_rotation_tp();
|
||||||
_file_helper.open(calc_filename(_base_filename, _extension));
|
_file_helper.open(calc_filename(_base_filename, _extension));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void _sink_it(const details::log_msg& msg) override
|
void _sink_it(const details::log_msg& msg) override
|
||||||
{
|
{
|
||||||
if (std::chrono::system_clock::now() >= _rotation_tp)
|
if (std::chrono::system_clock::now() >= _rotation_tp)
|
||||||
{
|
{
|
||||||
_file_helper.close();
|
|
||||||
_file_helper.open(calc_filename(_base_filename, _extension));
|
_file_helper.open(calc_filename(_base_filename, _extension));
|
||||||
_rotation_tp = _next_rotation_tp();
|
_rotation_tp = _next_rotation_tp();
|
||||||
}
|
}
|
||||||
@ -218,8 +210,6 @@ private:
|
|||||||
int _rotation_m;
|
int _rotation_m;
|
||||||
std::chrono::system_clock::time_point _rotation_tp;
|
std::chrono::system_clock::time_point _rotation_tp;
|
||||||
details::file_helper _file_helper;
|
details::file_helper _file_helper;
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef daily_file_sink<std::mutex> daily_file_sink_mt;
|
typedef daily_file_sink<std::mutex> daily_file_sink_mt;
|
||||||
|
Loading…
Reference in New Issue
Block a user