gitMirror/spdlog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #1130

Browse Source
This commit is contained in:
gabime
2019-07-05 10:44:54 +03:00
parent fbe6f945f3
commit 90dd56b839
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/spdlog/sinks/syslog_sink.h
View File

@@ -22,6 +22,15 @@ class syslog_sink : public base_sink<Mutex>
public:
syslog_sink(std::string ident, int syslog_option, int syslog_facility, bool enable_formatting)
: enable_formatting_{enable_formatting}
, syslog_levels_{
/* spdlog::level::trace */ LOG_DEBUG,
/* spdlog::level::debug */ LOG_DEBUG,
/* spdlog::level::info */ LOG_INFO,
/* spdlog::level::warn */ LOG_WARNING,
/* spdlog::level::err */ LOG_ERR,
/* spdlog::level::critical */ LOG_CRIT,
/* spdlog::level::off */ LOG_INFO
}
, ident_{std::move(ident)}
{
// set ident to be program name if empty
@@ -59,15 +68,7 @@ protected:
bool enable_formatting_ = false;
private:
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
};
std::array<int, 7> syslog_levels_;
// must store the ident because the man says openlog might use the pointer as
// is and not a string copy
const std::string ident_;

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

@@ -23,7 +23,16 @@ class systemd_sink : public base_sink<Mutex>
{
public:
//
explicit systemd_sink() {}
systemd_sink(): syslog_levels_{
/* spdlog::level::trace */ LOG_DEBUG,
/* spdlog::level::debug */ LOG_DEBUG,
/* spdlog::level::info */ LOG_INFO,
/* spdlog::level::warn */ LOG_WARNING,
/* spdlog::level::err */ LOG_ERR,
/* spdlog::level::critical */ LOG_CRIT,
/* spdlog::level::off */ LOG_INFO
}
{}
~systemd_sink() override {}
@@ -32,15 +41,7 @@ public:
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
};
std::array<int, 7> syslog_levels_;
void sink_it_(const details::log_msg &msg) override
{