Merge pull request #2328 from Delgan/GH-2323-add-systemd-identifier

Add optional "ident" argument to systemd sink constructor
gabime · Apr 2, 2022 · fc51c09 · fc51c09
2 parents 083ea59 + 36b4b9d
commit fc51c09
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/include/spdlog/sinks/systemd_sink.h b/include/spdlog/sinks/systemd_sink.h
@@ -23,8 +23,9 @@ template<typename Mutex>
 class systemd_sink : public base_sink<Mutex>
 {
 public:
-    explicit systemd_sink(bool enable_formatting = false)
-        : enable_formatting_{enable_formatting}
+    systemd_sink(std::string ident = "", bool enable_formatting = false)
+        : ident_{std::move(ident)}
+        , enable_formatting_{enable_formatting}
         , syslog_levels_{{/* spdlog::level::trace      */ LOG_DEBUG,
               /* spdlog::level::debug      */ LOG_DEBUG,
               /* spdlog::level::info       */ LOG_INFO,
@@ -40,6 +41,7 @@ class systemd_sink : public base_sink<Mutex>
     systemd_sink &operator=(const systemd_sink &) = delete;
 
 protected:
+    const std::string ident_;
     bool enable_formatting_ = false;
     using levels_array = std::array<int, 7>;
     levels_array syslog_levels_;
@@ -66,17 +68,19 @@ class systemd_sink : public base_sink<Mutex>
             length = static_cast<size_t>(std::numeric_limits<int>::max());
         }
 
+        const string_view_t syslog_identifier = ident_.empty() ? msg.logger_name : ident_;
+
         // Do not send source location if not available
         if (msg.source.empty())
         {
             // Note: function call inside '()' to avoid macro expansion
             err = (sd_journal_send)("MESSAGE=%.*s", static_cast<int>(length), payload.data(), "PRIORITY=%d", syslog_level(msg.level),
-                "SYSLOG_IDENTIFIER=%.*s", static_cast<int>(msg.logger_name.size()), msg.logger_name.data(), nullptr);
+                "SYSLOG_IDENTIFIER=%.*s", static_cast<int>(syslog_identifier.size()), syslog_identifier.data(), nullptr);
         }
         else
         {
             err = (sd_journal_send)("MESSAGE=%.*s", static_cast<int>(length), payload.data(), "PRIORITY=%d", syslog_level(msg.level),
-                "SYSLOG_IDENTIFIER=%.*s", static_cast<int>(msg.logger_name.size()), msg.logger_name.data(), "CODE_FILE=%s",
+                "SYSLOG_IDENTIFIER=%.*s", static_cast<int>(syslog_identifier.size()), syslog_identifier.data(), "CODE_FILE=%s",
                 msg.source.filename, "CODE_LINE=%d", msg.source.line, "CODE_FUNC=%s", msg.source.funcname, nullptr);
         }
 
@@ -100,14 +104,16 @@ using systemd_sink_st = systemd_sink<details::null_mutex>;
 
 // Create and register a syslog logger
 template<typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> systemd_logger_mt(const std::string &logger_name, bool enable_formatting = false)
+inline std::shared_ptr<logger> systemd_logger_mt(
+    const std::string &logger_name, const std::string &ident = "", bool enable_formatting = false)
 {
-    return Factory::template create<sinks::systemd_sink_mt>(logger_name, enable_formatting);
+    return Factory::template create<sinks::systemd_sink_mt>(logger_name, ident, enable_formatting);
 }
 
 template<typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> systemd_logger_st(const std::string &logger_name, bool enable_formatting = false)
+inline std::shared_ptr<logger> systemd_logger_st(
+    const std::string &logger_name, const std::string &ident = "", bool enable_formatting = false)
 {
-    return Factory::template create<sinks::systemd_sink_st>(logger_name, enable_formatting);
+    return Factory::template create<sinks::systemd_sink_st>(logger_name, ident, enable_formatting);
 }
 } // namespace spdlog