Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pwm1234/rotate on open #958

Merged
merged 7 commits into from
Jan 24, 2019
Merged

Pwm1234/rotate on open #958

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
52a01b2
add argument to rotating file sink for rotate_on_open
pwm1234-sri Sep 6, 2018
22f85de
Merge remote-tracking branch 'origin/v1.x' into pwm1234/rotate_on_open
pwm1234-sri Sep 6, 2018
4fe98bf
Merge remote-tracking branch 'origin/v1.x' into pwm1234/rotate_on_open
pwm1234-sri Jan 11, 2019
cce1e36
Merge remote-tracking branch 'origin/v1.x' into pwm1234/rotate_on_open
pwm1234-sri Jan 24, 2019
3925f8f
streamline constructor logic
pwm1234-sri Jan 24, 2019
e41b92c
fix inadvertent rename to original test function
pwm1234-sri Jan 24, 2019
4f65fcd
remove minor optimization for the sake of simplicity
pwm1234-sri Jan 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions include/spdlog/sinks/rotating_file_sink.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ template<typename Mutex>
class rotating_file_sink final : public base_sink<Mutex>
{
public:
rotating_file_sink(filename_t base_filename, std::size_t max_size, std::size_t max_files)
rotating_file_sink(filename_t base_filename, std::size_t max_size, std::size_t max_files, bool rotate_on_open=false)
: base_filename_(std::move(base_filename))
, max_size_(max_size)
, max_files_(max_files)
{
file_helper_.open(calc_filename(base_filename_, 0));
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be optimized. why open and then immediately close in rotate?

if (rotate_on_open)
rotate_();
current_size_ = file_helper_.size(); // expensive. called only once
}

Expand Down Expand Up @@ -141,15 +143,15 @@ using rotating_file_sink_st = rotating_file_sink<details::null_mutex>;

template<typename Factory = default_factory>
inline std::shared_ptr<logger> rotating_logger_mt(
const std::string &logger_name, const filename_t &filename, size_t max_file_size, size_t max_files)
const std::string &logger_name, const filename_t &filename, size_t max_file_size, size_t max_files, bool rotate_on_open=false)
{
return Factory::template create<sinks::rotating_file_sink_mt>(logger_name, filename, max_file_size, max_files);
return Factory::template create<sinks::rotating_file_sink_mt>(logger_name, filename, max_file_size, max_files, rotate_on_open);
}

template<typename Factory = default_factory>
inline std::shared_ptr<logger> rotating_logger_st(
const std::string &logger_name, const filename_t &filename, size_t max_file_size, size_t max_files)
const std::string &logger_name, const filename_t &filename, size_t max_file_size, size_t max_files, bool rotate_on_open = false)
{
return Factory::template create<sinks::rotating_file_sink_st>(logger_name, filename, max_file_size, max_files);
return Factory::template create<sinks::rotating_file_sink_st>(logger_name, filename, max_file_size, max_files, rotate_on_open);
}
} // namespace spdlog
2 changes: 1 addition & 1 deletion tests/test_file_logging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ TEST_CASE("rotating_file_logger2", "[rotating_logger]]")
prepare_logdir();
size_t max_size = 1024 * 10;
std::string basename = "logs/rotating_log";
auto logger = spdlog::rotating_logger_mt("logger", basename, max_size, 1);
auto logger = spdlog::rotating_logger_mt("logger", basename, max_size, 1, true);
for (int i = 0; i < 10; ++i)
{
logger->info("Test message {}", i);
Expand Down