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

Changed "auto_flush" to "force_flush" to better represent the meaning

This commit is contained in:
gabi 2015-01-07 12:44:02 +02:00
parent 06ef01f867
commit 7635455c8d
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/spdlog/details/file_helper.h
View File

@ -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;
};

16
include/spdlog/details/spdlog_impl.h
View File

@ -43,24 +43,24 @@ inline void spdlog::drop(const std::string &name)
}
// Create multi/single threaded rotating file logger
inline std::shared_ptr<spdlog::logger> 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::logger> 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<spdlog::sinks::rotating_file_sink_mt>(logger_name, filename, "txt", max_file_size, max_files, auto_flush);
return create<spdlog::sinks::rotating_file_sink_mt>(logger_name, filename, "txt", max_file_size, max_files, force_flush);
}
inline std::shared_ptr<spdlog::logger> 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::logger> 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<spdlog::sinks::rotating_file_sink_st>(logger_name, filename, "txt", max_file_size, max_files, auto_flush);
return create<spdlog::sinks::rotating_file_sink_st>(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::logger> spdlog::daily_logger_mt(const std::string& logger_name, const std::string& filename, bool auto_flush)
inline std::shared_ptr<spdlog::logger> spdlog::daily_logger_mt(const std::string& logger_name, const std::string& filename, bool force_flush)
{
return create<spdlog::sinks::daily_file_sink_mt>(logger_name, filename, "txt", auto_flush);
return create<spdlog::sinks::daily_file_sink_mt>(logger_name, filename, "txt", force_flush);
}
inline std::shared_ptr<spdlog::logger> spdlog::daily_logger_st(const std::string& logger_name, const std::string& filename, bool auto_flush)
inline std::shared_ptr<spdlog::logger> spdlog::daily_logger_st(const std::string& logger_name, const std::string& filename, bool force_flush)
{
return create<spdlog::sinks::daily_file_sink_st>(logger_name, filename, "txt", auto_flush);
return create<spdlog::sinks::daily_file_sink_st>(logger_name, filename, "txt", force_flush);
}

12
include/spdlog/sinks/file_sinks.h
View File

@ -44,8 +44,8 @@ class simple_file_sink : public base_sink<Mutex>
{
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<Mutex>
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<Mutex>
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));
}

8
include/spdlog/spdlog.h
View File

@ -70,14 +70,14 @@ void set_sync_mode();
//
// Create multi/single threaded rotating file logger
//
std::shared_ptr<logger> 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<logger> 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<logger> 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<logger> 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<logger> daily_logger_mt(const std::string& logger_name, const std::string& filename, bool auto_flush = false);
std::shared_ptr<logger> daily_logger_st(const std::string& logger_name, const std::string& filename, bool auto_flush = false);
std::shared_ptr<logger> daily_logger_mt(const std::string& logger_name, const std::string& filename, bool force_flush = false);
std::shared_ptr<logger> daily_logger_st(const std::string& logger_name, const std::string& filename, bool force_flush = false);
//