From af80db8c22f240120d3d4744ddc5501f25a87101 Mon Sep 17 00:00:00 2001 From: Alexander Zvyagin Date: Thu, 14 Mar 2019 16:20:58 +0100 Subject: [PATCH] Add systemd sink. --- include/spdlog/sinks/systemd_sink.h | 90 +++++++++++++++++++++++++++++ tests/test_systemd.cpp | 35 +++++++++++ 2 files changed, 125 insertions(+) create mode 100644 include/spdlog/sinks/systemd_sink.h create mode 100644 tests/test_systemd.cpp diff --git a/include/spdlog/sinks/systemd_sink.h b/include/spdlog/sinks/systemd_sink.h new file mode 100644 index 00000000..fe748a6b --- /dev/null +++ b/include/spdlog/sinks/systemd_sink.h @@ -0,0 +1,90 @@ +// +// Copyright(c) 2015 Gabi Melman. +// Distributed under the MIT License (http://opensource.org/licenses/MIT) +// + +#pragma once + +#ifndef SPDLOG_H +#include "spdlog/spdlog.h" +#endif + +#include "spdlog/sinks/base_sink.h" + +#include +#include +#include + +namespace spdlog { +namespace sinks { + +inline int syslog_level(level::level_enum l) { + switch(l) { + case level::off: + case level::trace: + case level::debug: + return LOG_DEBUG; + case level::info: + return LOG_INFO; + case level::warn: + return LOG_WARNING; + case level::err: + return LOG_ERR; + case level::critical: + return LOG_CRIT; + default: + throw std::invalid_argument("systemd_sink.h syslog_level()"); + } +} + +/** + * Sink that write to systemd using the `sd_journal_print()` library call. + * + * Locking is not needed, as `sd_journal_print()` itself is thread-safe. + */ +template +class systemd_sink : public base_sink +{ +public: + // + explicit systemd_sink(void) {} + + ~systemd_sink() override {} + + systemd_sink(const systemd_sink &) = delete; + systemd_sink &operator=(const systemd_sink &) = delete; + +protected: + void sink_it_(const details::log_msg &msg) override + { + if( sd_journal_print( + syslog_level(msg.level), + "%s", + fmt::to_string(msg.payload).c_str() + ) + ) + throw spdlog_ex("Failed writing to systemd"); + } + + void flush_() override {} +}; + +using systemd_sink_mt = systemd_sink; +using systemd_sink_st = systemd_sink; +} // namespace sinks + +// Create and register a syslog logger +template +inline std::shared_ptr systemd_logger_mt( + const std::string &logger_name) +{ + return Factory::template create(logger_name); +} + +template +inline std::shared_ptr systemd_logger_st( + const std::string &logger_name) +{ + return Factory::template create(logger_name); +} +} // namespace spdlog diff --git a/tests/test_systemd.cpp b/tests/test_systemd.cpp new file mode 100644 index 00000000..a75bc765 --- /dev/null +++ b/tests/test_systemd.cpp @@ -0,0 +1,35 @@ +#include "includes.h" +#include + +namespace { +const char *tested_logger_name = "main"; +} + +void run(spdlog::logger &logger) { + logger.debug("test debug"); + logger.error("test error"); + logger.info("test info"); +} + +// std::shared_ptr create_stdout_and_systemd_logger( +// std::string name="", +// spdlog::level::level_enum level_stdout=spdlog::level::level_enum::debug, +// spdlog::level::level_enum level_systemd=spdlog::level::level_enum::err +// ) { +// auto console_sink = std::make_shared(); +// console_sink->set_level(level_stdout); +// auto systemd_sink = std::make_shared(); +// systemd_sink->set_level(level_systemd); +// return std::make_shared(name, {console_sink, systemd_sink}); + +// } + +TEST_CASE("systemd", "[all]") +{ + auto console_sink = std::make_shared(); + console_sink->set_level(spdlog::level::level_enum::debug); + auto systemd_sink = std::make_shared(); + systemd_sink->set_level(spdlog::level::level_enum::err); + spdlog::logger logger("spdlog_systemd_test", {console_sink, systemd_sink}); + run(logger); +}