mirror of
https://github.com/gabime/spdlog.git
synced 2024-12-25 01:51:38 +08:00
Updated systemd sink and tests
This commit is contained in:
parent
8b403081c1
commit
9aa6cdc494
@ -12,26 +12,6 @@
|
|||||||
namespace spdlog {
|
namespace spdlog {
|
||||||
namespace sinks {
|
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 journal using the `sd_journal_send()` library call.
|
* Sink that write to systemd journal using the `sd_journal_send()` library call.
|
||||||
@ -51,31 +31,52 @@ public:
|
|||||||
systemd_sink &operator=(const systemd_sink &) = delete;
|
systemd_sink &operator=(const systemd_sink &) = delete;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
std::array<int, 7> syslog_levels_ {
|
||||||
|
/* level::trace */ LOG_DEBUG,
|
||||||
|
/* level::debug */ LOG_DEBUG,
|
||||||
|
/* level::info */ LOG_INFO,
|
||||||
|
/* level::warn */ LOG_WARNING,
|
||||||
|
/* level::err */ LOG_ERR,
|
||||||
|
/* level::critical */ LOG_CRIT,
|
||||||
|
/* level::off */ LOG_INFO
|
||||||
|
};
|
||||||
|
|
||||||
void sink_it_(const details::log_msg &msg) override
|
void sink_it_(const details::log_msg &msg) override
|
||||||
{
|
{
|
||||||
const char* key_msg = "MESSAGE=%.*s";
|
int err;
|
||||||
const char* key_prio = "PRIORITY=%d";
|
|
||||||
const char* key_file = "CODE_FILE=%s";
|
|
||||||
const char* key_line = "CODE_LINE=%d";
|
|
||||||
const char* key_func = "CODE_FUNC=%s";
|
|
||||||
|
|
||||||
if( !msg.source.filename || !msg.source.funcname || msg.source.line == 0 ) {
|
// Do not send source location if not available
|
||||||
// Do not send source location if not available
|
if(msg.source.empty())
|
||||||
key_file = nullptr;
|
{
|
||||||
|
// Note: function call inside '()' to avoid macro expansion
|
||||||
|
err = (sd_journal_send)(
|
||||||
|
"MESSAGE=%.*s", static_cast<int>(msg.payload.size()), msg.payload.data(),
|
||||||
|
"PRIORITY=%d", syslog_level(msg.level),
|
||||||
|
nullptr);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
err = (sd_journal_send)(
|
||||||
|
"MESSAGE=%.*s", static_cast<int>(msg.payload.size()), msg.payload.data(),
|
||||||
|
"PRIORITY=%d", syslog_level(msg.level),
|
||||||
|
"SOURCE_FILE=%s", msg.source.filename,
|
||||||
|
"SOURCE_LINE=%d", msg.source.line,
|
||||||
|
"SOURCE_FUNC=%s", msg.source.funcname,
|
||||||
|
nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Note: function call inside '()' to avoid macro expansion
|
if(err)
|
||||||
int err = (sd_journal_send)(
|
{
|
||||||
key_msg, static_cast<int>(msg.payload.size()), msg.payload.data(),
|
throw spdlog_ex("Failed writing to systemd", errno);
|
||||||
key_prio, syslog_level(msg.level),
|
|
||||||
key_file, msg.source.filename,
|
|
||||||
key_line, msg.source.line,
|
|
||||||
key_func, msg.source.funcname,
|
|
||||||
nullptr);
|
|
||||||
|
|
||||||
if( err ) {
|
|
||||||
throw spdlog_ex("Failed writing to systemd");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int syslog_level(level::level_enum l)
|
||||||
|
{
|
||||||
|
return syslog_levels_.at(static_cast<int>(l));
|
||||||
}
|
}
|
||||||
|
|
||||||
void flush_() override {}
|
void flush_() override {}
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
find_package(PkgConfig)
|
||||||
|
if(PkgConfig_FOUND)
|
||||||
|
pkg_check_modules(systemd libsystemd)
|
||||||
|
endif()
|
||||||
|
|
||||||
set(SPDLOG_UTESTS_SOURCES
|
set(SPDLOG_UTESTS_SOURCES
|
||||||
test_errors.cpp
|
test_errors.cpp
|
||||||
test_file_helper.cpp
|
test_file_helper.cpp
|
||||||
@ -17,6 +22,10 @@ set(SPDLOG_UTESTS_SOURCES
|
|||||||
test_stdout_api.cpp
|
test_stdout_api.cpp
|
||||||
test_dup_filter.cpp)
|
test_dup_filter.cpp)
|
||||||
|
|
||||||
|
if(systemd_FOUND)
|
||||||
|
set(SPDLOG_UTESTS_SOURCES ${SPDLOG_UTESTS_SOURCES} test_systemd.cpp)
|
||||||
|
endif()
|
||||||
|
|
||||||
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs")
|
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs")
|
||||||
enable_testing()
|
enable_testing()
|
||||||
|
|
||||||
@ -25,11 +34,14 @@ if(SPDLOG_BUILD_TESTS)
|
|||||||
add_executable(spdlog-utests ${SPDLOG_UTESTS_SOURCES})
|
add_executable(spdlog-utests ${SPDLOG_UTESTS_SOURCES})
|
||||||
spdlog_enable_warnings(spdlog-utests)
|
spdlog_enable_warnings(spdlog-utests)
|
||||||
target_link_libraries(spdlog-utests PRIVATE spdlog)
|
target_link_libraries(spdlog-utests PRIVATE spdlog)
|
||||||
|
|
||||||
|
if(systemd_FOUND)
|
||||||
|
target_link_libraries(spdlog-utests PRIVATE ${systemd_LIBRARIES})
|
||||||
|
endif()
|
||||||
if(SPDLOG_SANITIZE_ADDRESS)
|
if(SPDLOG_SANITIZE_ADDRESS)
|
||||||
spdlog_enable_sanitizer(spdlog-utests)
|
spdlog_enable_sanitizer(spdlog-utests)
|
||||||
endif()
|
endif()
|
||||||
add_test(NAME spdlog-utests COMMAND spdlog-utests)
|
add_test(NAME spdlog-utests COMMAND spdlog-utests)
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# The header-only library version tests
|
# The header-only library version tests
|
||||||
@ -37,6 +49,9 @@ if(SPDLOG_BUILD_HO_TESTS)
|
|||||||
add_executable(spdlog-utests-ho ${SPDLOG_UTESTS_SOURCES})
|
add_executable(spdlog-utests-ho ${SPDLOG_UTESTS_SOURCES})
|
||||||
spdlog_enable_warnings(spdlog-utests-ho)
|
spdlog_enable_warnings(spdlog-utests-ho)
|
||||||
target_link_libraries(spdlog-utests-ho PRIVATE spdlog::spdlog_header_only)
|
target_link_libraries(spdlog-utests-ho PRIVATE spdlog::spdlog_header_only)
|
||||||
|
if(systemd_FOUND)
|
||||||
|
target_link_libraries(spdlog-utests-ho PRIVATE ${systemd_LIBRARIES})
|
||||||
|
endif()
|
||||||
if(SPDLOG_SANITIZE_ADDRESS)
|
if(SPDLOG_SANITIZE_ADDRESS)
|
||||||
spdlog_set_address_sanitizer(spdlog-utests-ho)
|
spdlog_set_address_sanitizer(spdlog-utests-ho)
|
||||||
endif()
|
endif()
|
||||||
|
@ -1,13 +1,15 @@
|
|||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
#include <spdlog/sinks/systemd_sink.h>
|
#include "spdlog/sinks/systemd_sink.h"
|
||||||
|
|
||||||
TEST_CASE("systemd", "[all]")
|
TEST_CASE("systemd", "[all]")
|
||||||
{
|
{
|
||||||
auto systemd_sink = std::make_shared<spdlog::sinks::systemd_sink_st>();
|
auto systemd_sink = std::make_shared<spdlog::sinks::systemd_sink_st>();
|
||||||
systemd_sink->set_level(spdlog::level::level_enum::err);
|
|
||||||
spdlog::logger logger("spdlog_systemd_test", systemd_sink);
|
spdlog::logger logger("spdlog_systemd_test", systemd_sink);
|
||||||
|
logger.set_level(spdlog::level::trace);
|
||||||
logger.debug("test debug");
|
logger.trace("test spdlog trace");
|
||||||
SPDLOG_LOGGER_ERROR((&logger), "test error");
|
logger.debug("test spdlog debug");
|
||||||
logger.info("test info");
|
SPDLOG_LOGGER_INFO((&logger), "test spdlog info");
|
||||||
|
SPDLOG_LOGGER_WARN((&logger), "test spdlog warn");
|
||||||
|
SPDLOG_LOGGER_ERROR((&logger), "test spdlog error");
|
||||||
|
SPDLOG_LOGGER_CRITICAL((&logger), "test spdlog critical");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user