diff --git a/example/example.cpp b/example/example.cpp index a2dcbd1b..dded47f8 100644 --- a/example/example.cpp +++ b/example/example.cpp @@ -40,14 +40,12 @@ int main(int, char* []) // Set log level to all loggers to DEBUG and above spd::set_level(spd::level::DEBUG); - //Create console, multithreaded logger auto console = spd::stdout_logger_mt("console"); console->info("Welcome to spdlog!") ; console->info("An info message example {}..", 1); console->info() << "Streams are supported too " << 1; - console->info("Easy padding in numbers like {:08d}", 12); console->info("Support for int: {0:d}; hex: {0:08x}; oct: {0:o}; bin: {0:b}", 42); console->info("Support for floats {:03.2f}", 1.23456); @@ -69,27 +67,29 @@ int main(int, char* []) spd::get("console")->info("loggers can be retrieved from a global registry using the spdlog::get(logger_name) function"); + // Debug and trace macros to be turned on/off at compile time. + // Evaluates to empty statements if not turned on + // Define SPDLOG_DEBUG_ON or SPDLOG_TRACE_ON - before including spdlog.h SPDLOG_TRACE(console, "Enabled only #ifdef SPDLOG_TRACE_ON..{} ,{}", 1, 3.23); SPDLOG_DEBUG(console, "Enabled only #ifdef SPDLOG_DEBUG_ON.. {} ,{}", 1, 3.23); + - // +#ifdef __linux__ + // syslog example + std::string ident = "spdlog_example"; // empty ident can be used to use current program name + auto syslog_logger = spd::syslog_logger("syslog", ident, LOG_PID); + syslog_logger->set_pattern("[%l] %v"); //syslog already put timestamps so set the pattern to minimum (log level and the message) + syslog_logger->warn("This message that will end up in syslog. This is Linux only.."); +#endif + // Asynchronous logging is easy.. // Just call spdlog::set_async_mode(q_size) and all created loggers from now on will be asynchronous.. - // Note: queue size must be power of 2! - // - size_t max_q_size = 1048576; - spdlog::set_async_mode(max_q_size); + // Note: queue size must be power of 2! + size_t q_size = 1048576; + spdlog::set_async_mode(q_size); auto async_file= spd::daily_logger_st("async_file_logger", "logs/async_log.txt"); async_file->info() << "This is async log.." << "Should be very fast!"; - // - // syslog example - // -#ifdef __linux__ - std::string ident = "my_ident"; - auto syslog_logger = spd::syslog_logger("syslog", ident, spd::sinks::syslog::option::PID | spd::sinks::syslog::option::PERROR, "mail" ); - 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 c9bf2f00..8208b832 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -27,42 +27,12 @@ #include #include -#ifdef __linux__ - -#define SYSLOG_NAMES 1 -#include -#endif - namespace spdlog { class formatter; -namespace sinks -{ - -class sink; - -#ifdef __linux__ -namespace syslog -{ -namespace option -{ -typedef enum -{ - CONS = LOG_CONS, - NDELAY = LOG_NDELAY, - NOWAIT = LOG_NOWAIT, - ODELAY = LOG_ODELAY, - PERROR = LOG_PERROR, - PID = LOG_PID -} option_enum; -} -} -#endif - -} - +namespace sinks { class sink;} // Common types across the lib using log_clock = std::chrono::system_clock; diff --git a/include/spdlog/details/spdlog_impl.h b/include/spdlog/details/spdlog_impl.h index c50cef89..6b72f24b 100644 --- a/include/spdlog/details/spdlog_impl.h +++ b/include/spdlog/details/spdlog_impl.h @@ -87,9 +87,9 @@ inline std::shared_ptr spdlog::stderr_logger_st(const std::strin #ifdef __linux__ // Create syslog logger -inline std::shared_ptr spdlog::syslog_logger(const std::string& logger_name, const std::string& ident, int option, const std::string &facility) +inline std::shared_ptr spdlog::syslog_logger(const std::string& logger_name, const std::string& syslog_ident, int syslog_option) { - return create(logger_name, ident, option, facility); + return create(logger_name, syslog_ident, syslog_option); } #endif diff --git a/include/spdlog/sinks/syslog_sink.h b/include/spdlog/sinks/syslog_sink.h index 3889540f..b6bb5eca 100644 --- a/include/spdlog/sinks/syslog_sink.h +++ b/include/spdlog/sinks/syslog_sink.h @@ -27,7 +27,7 @@ #ifdef __linux__ #include - +#include #include "./sink.h" #include "../common.h" @@ -46,9 +46,10 @@ namespace sinks class syslog_sink : public sink { public: - syslog_sink(const std::string& ident = "", int option = static_cast(syslog::option::PID), const std::string &facility = "user") + // + syslog_sink(const std::string& ident = "", int syslog_option=0, int syslog_facility=LOG_USER): + _ident(ident) { - _priorities[static_cast(level::TRACE)] = LOG_DEBUG; _priorities[static_cast(level::DEBUG)] = LOG_DEBUG; _priorities[static_cast(level::INFO)] = LOG_INFO; @@ -60,10 +61,12 @@ public: _priorities[static_cast(level::EMERG)] = LOG_EMERG; _priorities[static_cast(level::OFF)] = LOG_INFO; - ::openlog(ident.c_str(), option, syslog_facility_from_name(facility)); + //set ident to be program name if empty + ::openlog(_ident.empty()? nullptr:_ident.c_str(), syslog_option, syslog_facility); } - virtual ~syslog_sink() { - ::closelog(); + ~syslog_sink() + { + ::closelog(); } syslog_sink(const syslog_sink&) = delete; @@ -74,33 +77,20 @@ public: ::syslog(syslog_prio_from_level(msg), "%s", msg.formatted.str().c_str()); }; -protected: - /** - * Simply maps spdlog's log level to syslog priority level. - */ + +private: + std::array _priorities; + //must store the ident because the man says openlog might use the pointer as is and not a string copy + const std::string _ident; + + // + // 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; - - inline int syslog_facility_from_name (const std::string & name) - { - if (name.empty()) - return LOG_USER; - - for (int i = 0; facilitynames[i].c_name != NULL; ++i) - { - if (name == facilitynames[i].c_name) - return facilitynames[i].c_val; - } - - return LOG_USER; - - } + } }; } } diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h index d538a0b4..5b03b939 100644 --- a/include/spdlog/spdlog.h +++ b/include/spdlog/spdlog.h @@ -96,8 +96,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, const std::string& ident = "", int option = static_cast(sinks::syslog::option::PID), const std::string &facility = "user"); +std::shared_ptr syslog_logger(const std::string& logger_name, const std::string& ident = "", int syslog_option = 0); #endif //