diff --git a/example/example.cpp b/example/example.cpp index 1459633e..10a0a93e 100644 --- a/example/example.cpp +++ b/example/example.cpp @@ -64,10 +64,10 @@ int main(int, char* []) SPDLOG_TRACE(file_logger, "This is a trace message (only #ifdef _DEBUG)", 123); - #ifdef __linux__ - auto syslog_logger = spd::syslog_logger("syslog"); - syslog_logger->warn("This is warning that will end up in syslog. This is Linux only!"); - #endif +#ifdef __linux__ + auto syslog_logger = spd::syslog_logger("syslog"); + syslog_logger->warn("This is warning that will end up in syslog. This is Linux only!"); +#endif } catch (const spd::spdlog_ex& ex) { diff --git a/include/spdlog/common.h b/include/spdlog/common.h index 7b4a4220..1be17d0d 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -50,7 +50,7 @@ typedef enum DEBUG = 1, INFO = 2, NOTICE = 3, - WARN = 4, + WARN = 4, ERR = 5, CRITICAL = 6, ALERT = 7, @@ -60,7 +60,8 @@ typedef enum } level_enum; static const char* level_names[] { "trace", "debug", "info", "notice", "warning", "error", "critical", - "alert", "emerg", "", ""}; + "alert", "emerg", "", "" + }; inline const char* to_str(spdlog::level::level_enum l) { return level_names[l]; diff --git a/include/spdlog/details/file_helper.h b/include/spdlog/details/file_helper.h index f6aa5a3e..505d6083 100644 --- a/include/spdlog/details/file_helper.h +++ b/include/spdlog/details/file_helper.h @@ -82,10 +82,10 @@ public: void reopen() { - if(_filename.empty()) - throw spdlog_ex("Failed re opening file - was not opened before"); - open(_filename); - + if(_filename.empty()) + throw spdlog_ex("Failed re opening file - was not opened before"); + open(_filename); + } void close() diff --git a/include/spdlog/sinks/file_sinks.h b/include/spdlog/sinks/file_sinks.h index 8e9c1485..13c1248a 100644 --- a/include/spdlog/sinks/file_sinks.h +++ b/include/spdlog/sinks/file_sinks.h @@ -125,12 +125,12 @@ private: std::string target = calc_filename(_base_filename, i, _extension); if (details::file_helper::file_exists(target)) - { - if (std::remove(target.c_str()) != 0) - { - throw spdlog_ex("rotating_file_sink: failed removing " + target); - } - } + { + if (std::remove(target.c_str()) != 0) + { + throw spdlog_ex("rotating_file_sink: failed removing " + target); + } + } if (details::file_helper::file_exists(src) && std::rename(src.c_str(), target.c_str())) { throw spdlog_ex("rotating_file_sink: failed renaming " + src + " to " + target); diff --git a/include/spdlog/sinks/syslog_sink.h b/include/spdlog/sinks/syslog_sink.h index 1d7c28d0..2aee3f7c 100644 --- a/include/spdlog/sinks/syslog_sink.h +++ b/include/spdlog/sinks/syslog_sink.h @@ -35,54 +35,54 @@ namespace spdlog { - namespace sinks - { - /** - * Sink that write to syslog using the `syscall()` library call. - * - * Locking is not needed, as `syslog()` itself is thread-safe. - */ - class syslog_sink : public sink +namespace sinks +{ +/** + * Sink that write to syslog using the `syscall()` library call. + * + * Locking is not needed, as `syslog()` itself is thread-safe. + */ +class syslog_sink : public sink +{ +public: + syslog_sink() { - public: - syslog_sink() - { - _priorities[static_cast(level::TRACE)] = LOG_DEBUG; - _priorities[static_cast(level::DEBUG)] = LOG_DEBUG; - _priorities[static_cast(level::INFO)] = LOG_INFO; - _priorities[static_cast(level::NOTICE)] = LOG_NOTICE; - _priorities[static_cast(level::WARN)] = LOG_WARNING; - _priorities[static_cast(level::ERR)] = LOG_ERR; - _priorities[static_cast(level::CRITICAL)] = LOG_CRIT; - _priorities[static_cast(level::ALERT)] = LOG_ALERT; - _priorities[static_cast(level::EMERG)] = LOG_EMERG; + _priorities[static_cast(level::TRACE)] = LOG_DEBUG; + _priorities[static_cast(level::DEBUG)] = LOG_DEBUG; + _priorities[static_cast(level::INFO)] = LOG_INFO; + _priorities[static_cast(level::NOTICE)] = LOG_NOTICE; + _priorities[static_cast(level::WARN)] = LOG_WARNING; + _priorities[static_cast(level::ERR)] = LOG_ERR; + _priorities[static_cast(level::CRITICAL)] = LOG_CRIT; + _priorities[static_cast(level::ALERT)] = LOG_ALERT; + _priorities[static_cast(level::EMERG)] = LOG_EMERG; - _priorities[static_cast(level::ALWAYS)] = LOG_INFO; - _priorities[static_cast(level::OFF)] = LOG_INFO; - } - virtual ~syslog_sink() = default; - - syslog_sink(const syslog_sink&) = delete; - syslog_sink& operator=(const syslog_sink&) = delete; - - void log(const details::log_msg &msg) override - { - syslog(syslog_prio_from_level(msg), "%s", msg.formatted.str().c_str()); - }; + _priorities[static_cast(level::ALWAYS)] = LOG_INFO; + _priorities[static_cast(level::OFF)] = LOG_INFO; + } + virtual ~syslog_sink() = default; - protected: - /** - * Simply maps spdlog's log level to syslog priority level. - */ - int syslog_prio_from_level(const details::log_msg &msg) const - { - return _priorities[static_cast(msg.level)]; - } + syslog_sink(const syslog_sink&) = delete; + syslog_sink& operator=(const syslog_sink&) = delete; - private: - std::array _priorities; + void log(const details::log_msg &msg) override + { + syslog(syslog_prio_from_level(msg), "%s", msg.formatted.str().c_str()); }; - } + +protected: + /** + * Simply maps spdlog's log level to syslog priority level. + */ + int syslog_prio_from_level(const details::log_msg &msg) const + { + return _priorities[static_cast(msg.level)]; + } + +private: + std::array _priorities; +}; +} } #endif diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index 42bff205..ddad0fda 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -70,7 +70,7 @@ std::shared_ptr stderr_logger_st(const std::string& logger_name); // Create a syslog logger #ifdef __linux__ - std::shared_ptr syslog_logger(const std::string& logger_name); +std::shared_ptr syslog_logger(const std::string& logger_name); #endif