* openlog setup for syslog sink

This commit is contained in:
fooinha 2014-12-16 15:13:35 +00:00
parent fbd2a33bbd
commit 8c9a6fc02c
6 changed files with 56 additions and 14 deletions

View File

@ -85,7 +85,8 @@ int main(int, char* [])
// syslog example // syslog example
// //
#ifdef __linux__ #ifdef __linux__
auto syslog_logger = spd::syslog_logger("syslog"); 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!"); syslog_logger->warn("This is warning that will end up in syslog. This is Linux only!");
#endif #endif
} }

View File

@ -115,8 +115,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define FMT_DISALLOW_COPY_AND_ASSIGN(TypeName) \ #define FMT_DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&); \ TypeName(const TypeName&); \
void operator=(const TypeName&) void operator=(const TypeName&)
namespace spdlog { namespace spdlog
namespace details { {
namespace details
{
namespace fmt namespace fmt
{ {
@ -2849,8 +2851,10 @@ fmt::print(format, args...);
#define FMT_VARIADIC_W(ReturnType, func, ...) \ #define FMT_VARIADIC_W(ReturnType, func, ...) \
FMT_VARIADIC_(wchar_t, ReturnType, func, return func, __VA_ARGS__) FMT_VARIADIC_(wchar_t, ReturnType, func, return func, __VA_ARGS__)
namespace spdlog { namespace spdlog
namespace details { {
namespace details
{
namespace fmt namespace fmt
{ {
FMT_VARIADIC(std::string, format, StringRef) FMT_VARIADIC(std::string, format, StringRef)

View File

@ -87,9 +87,9 @@ inline std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st(const std::strin
#ifdef __linux__ #ifdef __linux__
// Create syslog logger // Create syslog logger
inline std::shared_ptr<spdlog::logger> spdlog::syslog_logger(const std::string& logger_name) inline std::shared_ptr<spdlog::logger> spdlog::syslog_logger(const std::string& logger_name, const std::string& ident, int option , const std::string & facility)
{ {
return create<spdlog::sinks::syslog_sink>(logger_name); return create<spdlog::sinks::syslog_sink>(logger_name, ident, option, facility);
} }
#endif #endif

View File

@ -27,6 +27,9 @@
#ifdef __linux__ #ifdef __linux__
#include <string> #include <string>
#define SYSLOG_NAMES 1
#include <syslog.h> #include <syslog.h>
#include "./sink.h" #include "./sink.h"
#include "../common.h" #include "../common.h"
@ -37,6 +40,21 @@ namespace spdlog
{ {
namespace sinks namespace sinks
{ {
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;
}
}
/** /**
* Sink that write to syslog using the `syscall()` library call. * Sink that write to syslog using the `syscall()` library call.
* *
@ -45,8 +63,9 @@ namespace sinks
class syslog_sink : public sink class syslog_sink : public sink
{ {
public: public:
syslog_sink() syslog_sink(const std::string& ident = "", int option = static_cast<int>(syslog::option::PID), const std::string &facility = "user")
{ {
_priorities[static_cast<int>(level::TRACE)] = LOG_DEBUG; _priorities[static_cast<int>(level::TRACE)] = LOG_DEBUG;
_priorities[static_cast<int>(level::DEBUG)] = LOG_DEBUG; _priorities[static_cast<int>(level::DEBUG)] = LOG_DEBUG;
_priorities[static_cast<int>(level::INFO)] = LOG_INFO; _priorities[static_cast<int>(level::INFO)] = LOG_INFO;
@ -59,6 +78,8 @@ public:
_priorities[static_cast<int>(level::ALWAYS)] = LOG_INFO; _priorities[static_cast<int>(level::ALWAYS)] = LOG_INFO;
_priorities[static_cast<int>(level::OFF)] = LOG_INFO; _priorities[static_cast<int>(level::OFF)] = LOG_INFO;
::openlog(ident.c_str(), option, syslog_facility_from_name(facility));
} }
virtual ~syslog_sink() = default; virtual ~syslog_sink() = default;
@ -67,10 +88,11 @@ public:
void log(const details::log_msg &msg) override void log(const details::log_msg &msg) override
{ {
syslog(syslog_prio_from_level(msg), "%s", msg.formatted.str().c_str()); ::syslog(syslog_prio_from_level(msg), "%s", msg.formatted.str().c_str());
}; };
protected: protected:
/** /**
* Simply maps spdlog's log level to syslog priority level. * Simply maps spdlog's log level to syslog priority level.
*/ */
@ -81,6 +103,21 @@ protected:
private: private:
std::array<int, 11> _priorities; std::array<int, 11> _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;
}
}; };
} }
} }

View File

@ -96,7 +96,7 @@ std::shared_ptr<logger> stderr_logger_st(const std::string& logger_name);
// Create a syslog logger // Create a syslog logger
// //
#ifdef __linux__ #ifdef __linux__
std::shared_ptr<logger> syslog_logger(const std::string& logger_name); std::shared_ptr<logger> syslog_logger(const std::string& logger_name, const std::string& ident, int option, const std::string &facility);
#endif #endif
// //