Commit b4b9828d authored by louiz’'s avatar louiz’

Follow log_level even when using journald output

fix #3328
parent 34d6c2bc
Pipeline #1079 passed with stages
in 10 minutes and 46 seconds
......@@ -10,6 +10,8 @@ Version 7.0
would ignore our messages entirely.
- Fix the iq result sent at the end of a MAM response. Some clients (e.g.
gajim) would throw an error as a result.
- log_level configuration option is no longer ignored if the logs are written
into journald
Sqlite3 to PostgreSQL migration
-------------------------------
......
......@@ -74,8 +74,8 @@ public:
bool use_systemd{false};
#endif
private:
const int log_level;
private:
std::ofstream ofstream{};
std::ostream stream;
......@@ -105,13 +105,16 @@ namespace logging_details
if (Logger::instance()->use_systemd)
{
(void)level;
std::ostringstream os;
log(os, std::forward<U>(args)...);
sd_journal_send("MESSAGE=%s", os.str().data(),
"PRIORITY=%i", syslog_level,
"CODE_FILE=%s", src_file,
"CODE_LINE=%i", line,
nullptr);
if (level >= Logger::instance()->log_level)
{
std::ostringstream os;
log(os, std::forward<U>(args)...);
sd_journal_send("MESSAGE=%s", os.str().data(),
"PRIORITY=%i", syslog_level,
"CODE_FILE=%s", src_file,
"CODE_LINE=%i", line,
nullptr);
}
}
else
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment