mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-11-15 16:35:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1122 from jbelloncastro/v1.x

Browse Source 
Provide source location support for systemd_sink.h
This commit is contained in:
Gabi Melman 2019-06-28 08:07:38 +03:00 committed by GitHub
commit 8b403081c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/spdlog/sinks/systemd_sink.h
View File

@ -7,8 +7,6 @@
#include "spdlog/details/null_mutex.h"
#include "spdlog/details/synchronous_factory.h"
#include <array>
#include <string>
#include <systemd/sd-journal.h>
namespace spdlog {
@ -36,16 +34,16 @@ inline int syslog_level(level::level_enum l)
}
/**
* Sink that write to systemd using the `sd_journal_print()` library call.
* Sink that write to systemd journal using the `sd_journal_send()` library call.
*
* Locking is not needed, as `sd_journal_print()` itself is thread-safe.
* Locking is not needed, as `sd_journal_send()` itself is thread-safe.
*/
template<typename Mutex>
class systemd_sink : public base_sink<Mutex>
{
public:
//
explicit systemd_sink(void) {}
explicit systemd_sink() {}
~systemd_sink() override {}
@ -55,9 +53,30 @@ public:
protected:
void sink_it_(const details::log_msg &msg) override
{
if (sd_journal_print(syslog_level(msg.level), "%.*s", static_cast<int>(msg.payload.size()), msg.payload.data()))
const char* key_msg = "MESSAGE=%.*s";
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
key_file = nullptr;
}
// Note: function call inside '()' to avoid macro expansion
int err = (sd_journal_send)(
key_msg, static_cast<int>(msg.payload.size()), msg.payload.data(),
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");
}
}
void flush_() override {}
};

2
tests/test_systemd.cpp
View File

@ -8,6 +8,6 @@ TEST_CASE("systemd", "[all]")
spdlog::logger logger("spdlog_systemd_test", systemd_sink);
logger.debug("test debug");
logger.error("test error");
SPDLOG_LOGGER_ERROR((&logger), "test error");
logger.info("test info");
}