Follow log_level even when using journald output

fix #3328
This commit is contained in:
louiz’
2018-01-12 20:08:15 +01:00
parent 34d6c2bce1
commit b4b9828de5
2 changed files with 13 additions and 8 deletions
+2
View File
@@ -10,6 +10,8 @@ Version 7.0
would ignore our messages entirely. would ignore our messages entirely.
- Fix the iq result sent at the end of a MAM response. Some clients (e.g. - Fix the iq result sent at the end of a MAM response. Some clients (e.g.
gajim) would throw an error as a result. 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 Sqlite3 to PostgreSQL migration
------------------------------- -------------------------------
+11 -8
View File
@@ -74,8 +74,8 @@ public:
bool use_systemd{false}; bool use_systemd{false};
#endif #endif
private:
const int log_level; const int log_level;
private:
std::ofstream ofstream{}; std::ofstream ofstream{};
std::ostream stream; std::ostream stream;
@@ -105,13 +105,16 @@ namespace logging_details
if (Logger::instance()->use_systemd) if (Logger::instance()->use_systemd)
{ {
(void)level; (void)level;
std::ostringstream os; if (level >= Logger::instance()->log_level)
log(os, std::forward<U>(args)...); {
sd_journal_send("MESSAGE=%s", os.str().data(), std::ostringstream os;
"PRIORITY=%i", syslog_level, log(os, std::forward<U>(args)...);
"CODE_FILE=%s", src_file, sd_journal_send("MESSAGE=%s", os.str().data(),
"CODE_LINE=%i", line, "PRIORITY=%i", syslog_level,
nullptr); "CODE_FILE=%s", src_file,
"CODE_LINE=%i", line,
nullptr);
}
} }
else else
{ {