From 7635455c8dea74eaba434a41ab53df1d6f6a5e0b Mon Sep 17 00:00:00 2001 From: gabi Date: Wed, 7 Jan 2015 12:44:02 +0200 Subject: [PATCH] Changed "auto_flush" to "force_flush" to better represent the meaning --- include/spdlog/details/file_helper.h | 8 ++++---- include/spdlog/details/spdlog_impl.h | 16 ++++++++-------- include/spdlog/sinks/file_sinks.h | 12 ++++++------ include/spdlog/spdlog.h | 8 ++++---- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/spdlog/details/file_helper.h b/include/spdlog/details/file_helper.h index c05d4029..8ae67bf0 100644 --- a/include/spdlog/details/file_helper.h +++ b/include/spdlog/details/file_helper.h @@ -48,9 +48,9 @@ public: const int open_tries = 5; const int open_interval = 10; - explicit file_helper(bool auto_flush): + explicit file_helper(bool force_flush): _fd(nullptr), - _auto_flush(auto_flush) + _force_flush(force_flush) {} file_helper(const file_helper&) = delete; @@ -104,7 +104,7 @@ public: if(std::fwrite(data, 1, size, _fd) != size) throw spdlog_ex("Failed writing to file " + _filename); - if(_auto_flush) + if(_force_flush) std::fflush(_fd); } @@ -131,7 +131,7 @@ public: private: FILE* _fd; std::string _filename; - bool _auto_flush; + bool _force_flush; }; diff --git a/include/spdlog/details/spdlog_impl.h b/include/spdlog/details/spdlog_impl.h index 2218b001..02840b0b 100644 --- a/include/spdlog/details/spdlog_impl.h +++ b/include/spdlog/details/spdlog_impl.h @@ -43,24 +43,24 @@ inline void spdlog::drop(const std::string &name) } // Create multi/single threaded rotating file logger -inline std::shared_ptr spdlog::rotating_logger_mt(const std::string& logger_name, const std::string& filename, size_t max_file_size, size_t max_files, bool auto_flush) +inline std::shared_ptr spdlog::rotating_logger_mt(const std::string& logger_name, const std::string& filename, size_t max_file_size, size_t max_files, bool force_flush) { - return create(logger_name, filename, "txt", max_file_size, max_files, auto_flush); + return create(logger_name, filename, "txt", max_file_size, max_files, force_flush); } -inline std::shared_ptr spdlog::rotating_logger_st(const std::string& logger_name, const std::string& filename, size_t max_file_size, size_t max_files, bool auto_flush) +inline std::shared_ptr spdlog::rotating_logger_st(const std::string& logger_name, const std::string& filename, size_t max_file_size, size_t max_files, bool force_flush) { - return create(logger_name, filename, "txt", max_file_size, max_files, auto_flush); + return create(logger_name, filename, "txt", max_file_size, max_files, force_flush); } // Create file logger which creates new file at midnight): -inline std::shared_ptr spdlog::daily_logger_mt(const std::string& logger_name, const std::string& filename, bool auto_flush) +inline std::shared_ptr spdlog::daily_logger_mt(const std::string& logger_name, const std::string& filename, bool force_flush) { - return create(logger_name, filename, "txt", auto_flush); + return create(logger_name, filename, "txt", force_flush); } -inline std::shared_ptr spdlog::daily_logger_st(const std::string& logger_name, const std::string& filename, bool auto_flush) +inline std::shared_ptr spdlog::daily_logger_st(const std::string& logger_name, const std::string& filename, bool force_flush) { - return create(logger_name, filename, "txt", auto_flush); + return create(logger_name, filename, "txt", force_flush); } diff --git a/include/spdlog/sinks/file_sinks.h b/include/spdlog/sinks/file_sinks.h index 3e78d576..0f73f5c5 100644 --- a/include/spdlog/sinks/file_sinks.h +++ b/include/spdlog/sinks/file_sinks.h @@ -44,8 +44,8 @@ class simple_file_sink : public base_sink { public: explicit simple_file_sink(const std::string &filename, - bool auto_flush=false): - _file_helper(auto_flush) + bool force_flush=false): + _file_helper(force_flush) { _file_helper.open(filename); } @@ -71,13 +71,13 @@ class rotating_file_sink : public base_sink public: rotating_file_sink(const std::string &base_filename, const std::string &extension, std::size_t max_size, std::size_t max_files, - bool auto_flush=false): + bool force_flush=false): _base_filename(base_filename), _extension(extension), _max_size(max_size), _max_files(max_files), _current_size(0), - _file_helper(auto_flush) + _file_helper(force_flush) { _file_helper.open(calc_filename(_base_filename, 0, _extension)); } @@ -157,11 +157,11 @@ class daily_file_sink:public base_sink public: explicit daily_file_sink(const std::string& base_filename, const std::string& extension, - bool auto_flush=false): + bool force_flush=false): _base_filename(base_filename), _extension(extension), _midnight_tp (_calc_midnight_tp() ), - _file_helper(auto_flush) + _file_helper(force_flush) { _file_helper.open(calc_filename(_base_filename, _extension)); } diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 15be0522..7ce1735b 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -70,14 +70,14 @@ void set_sync_mode(); // // Create multi/single threaded rotating file logger // -std::shared_ptr rotating_logger_mt(const std::string& logger_name, const std::string& filename, size_t max_file_size, size_t max_files, bool auto_flush = false); -std::shared_ptr rotating_logger_st(const std::string& logger_name, const std::string& filename, size_t max_file_size, size_t max_files, bool auto_flush = false); +std::shared_ptr rotating_logger_mt(const std::string& logger_name, const std::string& filename, size_t max_file_size, size_t max_files, bool force_flush = false); +std::shared_ptr rotating_logger_st(const std::string& logger_name, const std::string& filename, size_t max_file_size, size_t max_files, bool force_flush = false); // // Create file logger which creates new file at midnight): // -std::shared_ptr daily_logger_mt(const std::string& logger_name, const std::string& filename, bool auto_flush = false); -std::shared_ptr daily_logger_st(const std::string& logger_name, const std::string& filename, bool auto_flush = false); +std::shared_ptr daily_logger_mt(const std::string& logger_name, const std::string& filename, bool force_flush = false); +std::shared_ptr daily_logger_st(const std::string& logger_name, const std::string& filename, bool force_flush = false); //