Mirror/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-09-30 02:19:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

wchar filenames support - minor improvements

Browse Source
This commit is contained in:
gabime
2016-04-10 00:02:19 +03:00
parent 23200b08bb
commit 19dae96985
7 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ template<class Mutex>
class simple_file_sink : public base_sink < Mutex >
{
public:
explicit simple_file_sink(const filename_str_t &filename,
explicit simple_file_sink(const filename_t &filename,
bool force_flush = false) :
_file_helper(force_flush)
{
@@ -58,7 +58,7 @@ template<class Mutex>
class rotating_file_sink : public base_sink < Mutex >
{
public:
rotating_file_sink(const filename_str_t &base_filename, const filename_str_t &extension,
rotating_file_sink(const filename_t &base_filename, const filename_t &extension,
std::size_t max_size, std::size_t max_files,
bool force_flush = false) :
_base_filename(base_filename),
@@ -90,9 +90,9 @@ protected:
}
private:
static filename_str_t calc_filename(const filename_str_t& filename, std::size_t index, const filename_str_t& extension)
static filename_t calc_filename(const filename_t& filename, std::size_t index, const filename_t& extension)
{
std::conditional<std::is_same<filename_char_t, char>::value, fmt::MemoryWriter, fmt::WMemoryWriter>::type w;
std::conditional<std::is_same<filename_t::value_type, char>::value, fmt::MemoryWriter, fmt::WMemoryWriter>::type w;
if (index)
w.write(SPDLOG_FILENAME_T("{}.{}.{}"), filename, index, extension);
else
@@ -111,25 +111,25 @@ private:
_file_helper.close();
for (auto i = _max_files; i > 0; --i)
{
filename_str_t src = calc_filename(_base_filename, i - 1, _extension);
filename_str_t target = calc_filename(_base_filename, i, _extension);
filename_t src = calc_filename(_base_filename, i - 1, _extension);
filename_t target = calc_filename(_base_filename, i, _extension);
if (details::file_helper::file_exists(target))
{
if (details::os::remove(target.c_str()) != 0)
if (details::os::remove(target) != 0)
{
throw spdlog_ex("rotating_file_sink: failed removing " + filename_to_bytes(target));
throw spdlog_ex("rotating_file_sink: failed removing " + filename_to_str(target));
}
}
if (details::file_helper::file_exists(src) && details::os::rename(src.c_str(), target.c_str()))
if (details::file_helper::file_exists(src) && details::os::rename(src, target))
{
throw spdlog_ex("rotating_file_sink: failed renaming " + filename_to_bytes(src) + " to " + filename_to_bytes(target));
throw spdlog_ex("rotating_file_sink: failed renaming " + filename_to_str(src) + " to " + filename_to_str(target));
}
}
_file_helper.reopen(true);
}
filename_str_t _base_filename;
filename_str_t _extension;
filename_t _base_filename;
filename_t _extension;
std::size_t _max_size;
std::size_t _max_files;
std::size_t _current_size;
@@ -148,8 +148,8 @@ class daily_file_sink :public base_sink < Mutex >
public:
//create daily file sink which rotates on given time
daily_file_sink(
const filename_str_t& base_filename,
const filename_str_t& extension,
const filename_t& base_filename,
const filename_t& extension,
int rotation_hour,
int rotation_minute,
bool force_flush = false) : _base_filename(base_filename),
@@ -198,16 +198,16 @@ private:
}
//Create filename for the form basename.YYYY-MM-DD.extension
static filename_str_t calc_filename(const filename_str_t& basename, const filename_str_t& extension)
static filename_t calc_filename(const filename_t& basename, const filename_t& extension)
{
std::tm tm = spdlog::details::os::localtime();
std::conditional<std::is_same<filename_char_t, char>::value, fmt::MemoryWriter, fmt::WMemoryWriter>::type w;
std::conditional<std::is_same<filename_t::value_type, char>::value, fmt::MemoryWriter, fmt::WMemoryWriter>::type w;
w.write(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}_{:02d}-{:02d}.{}"), basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, extension);
return w.str();
}
filename_str_t _base_filename;
filename_str_t _extension;
filename_t _base_filename;
filename_t _extension;
int _rotation_h;
int _rotation_m;
std::chrono::system_clock::time_point _rotation_tp;