diff --git a/include/spdlog/common.h b/include/spdlog/common.h index f86c02b9..01b22121 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -36,15 +36,6 @@ #define SPDLOG_NOEXCEPT throw() #endif -#if defined(WIN32) && defined(SPDLOG_USE_WCHAR) -typedef std::wstring tstring; -typedef wchar_t tchar; -#define S(s) L ## s -#else -#define S(s) s -typedef std::string tstring; -typedef char tchar; -#endif namespace spdlog { @@ -58,8 +49,8 @@ class sink; // Common types across the lib using log_clock = std::chrono::system_clock; -using sink_ptr = std::shared_ptr < sinks::sink > ; -using sinks_init_list = std::initializer_list < sink_ptr > ; +using sink_ptr = std::shared_ptr < sinks::sink >; +using sinks_init_list = std::initializer_list < sink_ptr >; using formatter_ptr = std::shared_ptr; @@ -68,16 +59,16 @@ namespace level { typedef enum { - trace = 0, - debug = 1, - info = 2, - notice = 3, - warn = 4, - err = 5, + trace = 0, + debug = 1, + info = 2, + notice = 3, + warn = 4, + err = 5, critical = 6, - alert = 7, - emerg = 8, - off = 9 + alert = 7, + emerg = 8, + off = 9 } level_enum; static const char* level_names[] { "trace", "debug", "info", "notice", "warning", "error", "critical", "alert", "emerg", "off"}; @@ -122,4 +113,4 @@ private: }; -} //spdlog +} //spdlog \ No newline at end of file diff --git a/include/spdlog/details/file_helper.h b/include/spdlog/details/file_helper.h index a5f9f265..5062e977 100644 --- a/include/spdlog/details/file_helper.h +++ b/include/spdlog/details/file_helper.h @@ -48,7 +48,7 @@ public: const int open_tries = 5; const int open_interval = 10; - explicit file_helper(bool force_flush): + explicit file_helper(bool force_flush) : _fd(nullptr), _force_flush(force_flush) {} @@ -62,26 +62,26 @@ public: } - void open(const tstring& fname, bool truncate=false) + void open(const std::string& fname, bool truncate = false) { close(); - const tchar* mode = truncate ? S("wb") : S("ab"); + const char* mode = truncate ? "wb" : "ab"; _filename = fname; for (int tries = 0; tries < open_tries; ++tries) { - if(!os::fopen_s(&_fd, fname, mode)) + if (!os::fopen_s(&_fd, fname, mode)) return; std::this_thread::sleep_for(std::chrono::milliseconds(open_interval)); } - throw spdlog_ex("Failed opening file for writing"); + throw spdlog_ex("Failed opening file " + fname + " for writing"); } void reopen(bool truncate) { - if(_filename.empty()) + if (_filename.empty()) throw spdlog_ex("Failed re opening file - was not opened before"); open(_filename, truncate); @@ -105,23 +105,23 @@ public: size_t size = msg.formatted.size(); auto data = msg.formatted.data(); - if(std::fwrite(data, 1, size, _fd) != size) - throw spdlog_ex("Failed writing to file"); + if (std::fwrite(data, 1, size, _fd) != size) + throw spdlog_ex("Failed writing to file " + _filename); - if(_force_flush) + if (_force_flush) std::fflush(_fd); } - const tstring& filename() const + const std::string& filename() const { return _filename; } - static bool file_exists(const tstring& name) + static bool file_exists(const std::string& name) { FILE* file; - if (!os::fopen_s(&file, name.c_str(), S("r"))) + if (!os::fopen_s(&file, name.c_str(), "r")) { fclose(file); return true; @@ -134,11 +134,10 @@ public: private: FILE* _fd; - tstring _filename; + std::string _filename; bool _force_flush; }; } } - diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h index 6af4771e..5748033b 100644 --- a/include/spdlog/details/os.h +++ b/include/spdlog/details/os.h @@ -147,37 +147,17 @@ constexpr inline unsigned short eol_size() #endif //fopen_s on non windows for writing -inline int fopen_s(FILE** fp, const tstring& filename, const tchar* mode) +inline int fopen_s(FILE** fp, const std::string& filename, const char* mode) { -#if defined(WIN32) - #if defined(SPDLOG_USE_WCHAR) - *fp = _wfsopen((filename.c_str()), mode, _SH_DENYWR); - #else +#ifdef _WIN32 *fp = _fsopen((filename.c_str()), mode, _SH_DENYWR); - #endif return *fp == nullptr; #else *fp = fopen((filename.c_str()), mode); return *fp == nullptr; #endif -} -inline int remove(const tchar* filename) -{ -#if defined(WIN32) && defined(SPDLOG_USE_WCHAR) - return _wremove(filename); -#else - return std::remove(filename); -#endif -} -inline int rename(const tchar* filename1, const tchar* filename2) -{ -#if defined(WIN32) && defined(SPDLOG_USE_WCHAR) - return _wrename(filename1, filename2); -#else - return std::rename(filename1, filename2); -#endif } //Return utc offset in minutes or -1 on failure @@ -215,4 +195,3 @@ inline size_t thread_id() } //spdlog - diff --git a/include/spdlog/details/spdlog_impl.h b/include/spdlog/details/spdlog_impl.h index 2530b596..cfd6f826 100644 --- a/include/spdlog/details/spdlog_impl.h +++ b/include/spdlog/details/spdlog_impl.h @@ -48,24 +48,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 tstring& filename, size_t max_file_size, size_t max_files, bool force_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, S("txt"), max_file_size, max_files, force_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 tstring& filename, size_t max_file_size, size_t max_files, bool 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 force_flush) { - return create(logger_name, filename, S("txt"), max_file_size, max_files, force_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 tstring& filename, int hour, int minute, bool force_flush) +inline std::shared_ptr spdlog::daily_logger_mt(const std::string& logger_name, const std::string& filename, int hour, int minute, bool force_flush) { - return create(logger_name, filename, S("txt"), hour, minute, force_flush); + return create(logger_name, filename, "txt", hour, minute, force_flush); } -inline std::shared_ptr spdlog::daily_logger_st(const std::string& logger_name, const tstring& filename, int hour, int minute, bool force_flush) +inline std::shared_ptr spdlog::daily_logger_st(const std::string& logger_name, const std::string& filename, int hour, int minute, bool force_flush) { - return create(logger_name, filename, S("txt"), hour, minute, force_flush); + return create(logger_name, filename, "txt", hour, minute, force_flush); } diff --git a/include/spdlog/sinks/file_sinks.h b/include/spdlog/sinks/file_sinks.h index 0f0824e7..8d36f316 100644 --- a/include/spdlog/sinks/file_sinks.h +++ b/include/spdlog/sinks/file_sinks.h @@ -29,7 +29,6 @@ #include "../details/null_mutex.h" #include "../details/file_helper.h" #include "../details/format.h" -#include "../details/os.h" namespace spdlog { @@ -66,13 +65,13 @@ typedef simple_file_sink simple_file_sink_mt; typedef simple_file_sink simple_file_sink_st; /* - * Rotating file sink based on size - */ +* Rotating file sink based on size +*/ template class rotating_file_sink : public base_sink < Mutex > { public: - rotating_file_sink(const tstring &base_filename, const tstring &extension, + rotating_file_sink(const std::string &base_filename, const std::string &extension, std::size_t max_size, std::size_t max_files, bool force_flush = false) : _base_filename(base_filename), @@ -103,13 +102,13 @@ protected: } private: - static tstring calc_filename(const tstring& filename, std::size_t index, const tstring& extension) + static std::string calc_filename(const std::string& filename, std::size_t index, const std::string& extension) { - fmt::TMemoryWriter w; + fmt::MemoryWriter w; if (index) - w.write(S("{}.{}.{}"), filename, index, extension); + w.write("{}.{}.{}", filename, index, extension); else - w.write(S("{}.{}"), filename, extension); + w.write("{}.{}", filename, extension); return w.str(); } @@ -124,25 +123,25 @@ private: _file_helper.close(); for (auto i = _max_files; i > 0; --i) { - tstring src = calc_filename(_base_filename, i - 1, _extension); - tstring target = calc_filename(_base_filename, i, _extension); + std::string src = calc_filename(_base_filename, i - 1, _extension); + std::string target = calc_filename(_base_filename, i, _extension); if (details::file_helper::file_exists(target)) { - if (details::os::remove(target.c_str()) != 0) + if (std::remove(target.c_str()) != 0) { - throw spdlog_ex("rotating_file_sink: failed removing"); + throw spdlog_ex("rotating_file_sink: failed removing " + target); } } - if (details::file_helper::file_exists(src) && details::os::rename(src.c_str(), target.c_str())) + if (details::file_helper::file_exists(src) && std::rename(src.c_str(), target.c_str())) { - throw spdlog_ex("rotating_file_sink: failed renaming"); + throw spdlog_ex("rotating_file_sink: failed renaming " + src + " to " + target); } } _file_helper.reopen(true); } - tstring _base_filename; - tstring _extension; + std::string _base_filename; + std::string _extension; std::size_t _max_size; std::size_t _max_files; std::size_t _current_size; @@ -153,16 +152,16 @@ typedef rotating_file_sink rotating_file_sink_mt; typedef rotating_file_sinkrotating_file_sink_st; /* - * Rotating file sink based on date. rotates at midnight - */ +* Rotating file sink based on date. rotates at midnight +*/ template class daily_file_sink :public base_sink < Mutex > { public: //create daily file sink which rotates on given time daily_file_sink( - const tstring& base_filename, - const tstring& extension, + const std::string& base_filename, + const std::string& extension, int rotation_hour, int rotation_minute, bool force_flush = false) : _base_filename(base_filename), @@ -211,16 +210,16 @@ private: } //Create filename for the form basename.YYYY-MM-DD.extension - static tstring calc_filename(const tstring& basename, const tstring& extension) + static std::string calc_filename(const std::string& basename, const std::string& extension) { std::tm tm = spdlog::details::os::localtime(); - fmt::TMemoryWriter w; - w.write(S("{}_{:04d}-{:02d}-{:02d}_{:02d}-{:02d}.{}"), basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, extension); + fmt::MemoryWriter w; + w.write("{}_{: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(); } - tstring _base_filename; - tstring _extension; + std::string _base_filename; + std::string _extension; int _rotation_h; int _rotation_m; std::chrono::system_clock::time_point _rotation_tp; @@ -230,4 +229,4 @@ private: typedef daily_file_sink daily_file_sink_mt; typedef daily_file_sink daily_file_sink_st; } -} +} \ No newline at end of file diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 61e9a8b3..aef04069 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -76,14 +76,14 @@ void set_sync_mode(); // // Create and register multi/single threaded rotating file logger // -std::shared_ptr rotating_logger_mt(const std::string& logger_name, const tstring& 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 tstring& filename, size_t max_file_size, size_t max_files, bool force_flush = false); +std::shared_ptr rotating_logger_mt(const std::string& logger_name, const std::string& filenameB, 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 on the given time (default in midnight): // -std::shared_ptr daily_logger_mt(const std::string& logger_name, const tstring& filename, int hour=0, int minute=0, bool force_flush = false); -std::shared_ptr daily_logger_st(const std::string& logger_name, const tstring& filename, int hour=0, int minute=0, bool force_flush = false); +std::shared_ptr daily_logger_mt(const std::string& logger_name, const std::string& filename, int hour=0, int minute=0, bool force_flush = false); +std::shared_ptr daily_logger_st(const std::string& logger_name, const std::string& filename, int hour=0, int minute=0, bool force_flush = false); // diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h index 7e0bb41b..b651658b 100644 --- a/include/spdlog/tweakme.h +++ b/include/spdlog/tweakme.h @@ -72,9 +72,3 @@ // Note that upon creating a logger the registry is modified by spdlog.. // #define SPDLOG_NO_REGISTRY_MUTEX /////////////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////////////// -// Uncomment to enable usage of wchar_t for file names on Windows. -// #define SPDLOG_USE_WCHAR -///////////////////////////////////////////////////////////////////////////////