From afea332bbd8c3d2e9a8e9ae6485bbef47fcfb03b Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Wed, 4 Dec 2024 11:30:55 +0200 Subject: [PATCH] Some cleanup --- include/spdlog/common.h | 5 +++-- include/spdlog/sinks/daily_file_sink.h | 6 ++---- include/spdlog/sinks/hourly_file_sink.h | 7 +++---- src/sinks/rotating_file_sink.cpp | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/spdlog/common.h b/include/spdlog/common.h index d2fb8cc5..1b584556 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -48,14 +48,15 @@ namespace sinks { class sink; } -using filename_t = std::filesystem::path; -#ifdef _WIN32 // Add L prefix to string literals on Windows when dealing with filenames +#ifdef _WIN32 + // In windows, add L prefix for filename literals (e.g. L"filename.txt") #define SPDLOG_FILENAME_T_INNER(s) L##s #define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s) #else #define SPDLOG_FILENAME_T(s) s #endif +using filename_t = std::filesystem::path; using log_clock = std::chrono::system_clock; using sink_ptr = std::shared_ptr; using sinks_init_list = std::initializer_list; diff --git a/include/spdlog/sinks/daily_file_sink.h b/include/spdlog/sinks/daily_file_sink.h index 42f77b55..893bf96a 100644 --- a/include/spdlog/sinks/daily_file_sink.h +++ b/include/spdlog/sinks/daily_file_sink.h @@ -30,10 +30,8 @@ struct daily_filename_calculator { filename_t basename, ext; std::tie(basename, ext) = details::file_helper::split_by_extension(filename); std::basic_ostringstream oss; - auto sep = SPDLOG_FILENAME_T('-'); - oss << basename.native() << SPDLOG_FILENAME_T('_') << std::setfill(SPDLOG_FILENAME_T('0')) << std::setw(4) - << now_tm.tm_year + 1900 << sep - << std::setw(2) << now_tm.tm_mon + 1 << sep << std::setw(2) << now_tm.tm_mday << ext.native(); + oss << basename.native() << '_' << std::setfill(SPDLOG_FILENAME_T('0')) << std::setw(4) << now_tm.tm_year + 1900 << '-' + << std::setw(2) << now_tm.tm_mon + 1 << '-' << std::setw(2) << now_tm.tm_mday << ext.native(); return oss.str(); } }; diff --git a/include/spdlog/sinks/hourly_file_sink.h b/include/spdlog/sinks/hourly_file_sink.h index 2e98e399..43c6a638 100644 --- a/include/spdlog/sinks/hourly_file_sink.h +++ b/include/spdlog/sinks/hourly_file_sink.h @@ -29,10 +29,9 @@ struct hourly_filename_calculator { static filename_t calc_filename(const filename_t &filename, const tm &now_tm) { filename_t basename, ext; std::tie(basename, ext) = details::file_helper::split_by_extension(filename); - std::basic_ostringstream oss; - auto sep = SPDLOG_FILENAME_T('-'); - oss << basename.native() << sep << std::setfill(SPDLOG_FILENAME_T('0')) << std::setw(4) << now_tm.tm_year + 1900 << sep - << std::setw(2) << now_tm.tm_mon + 1 << sep << std::setw(2) << now_tm.tm_mday << sep << std::setw(2) << now_tm.tm_hour + std::basic_ostringstream oss; + oss << basename.native() << '-' << std::setfill(SPDLOG_FILENAME_T('0')) << std::setw(4) << now_tm.tm_year + 1900 << '-' + << std::setw(2) << now_tm.tm_mon + 1 << '-' << std::setw(2) << now_tm.tm_mday << '-' << std::setw(2) << now_tm.tm_hour << ext.native(); return oss.str(); } diff --git a/src/sinks/rotating_file_sink.cpp b/src/sinks/rotating_file_sink.cpp index 378a816a..7ace820c 100644 --- a/src/sinks/rotating_file_sink.cpp +++ b/src/sinks/rotating_file_sink.cpp @@ -54,7 +54,7 @@ filename_t rotating_file_sink::calc_filename(const filename_t &filename, filename_t ext; std::tie(basename, ext) = details::file_helper::split_by_extension(filename); std::basic_ostringstream oss; - oss << basename.native() << "." << index << ext.native(); + oss << basename.native() << '.' << index << ext.native(); return oss.str(); //return fmt_lib::format(SPDLOG_FMT_STRING(SPDLOG_FILENAME_T("{}.{}{}")), basename, index, ext); }