From c18e611a6b8c07049cc82b2dcdb5b138d9a6dd43 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wolfgang=20M=C3=BCller?= Date: Wed, 13 Feb 2019 14:48:19 +0100 Subject: [PATCH] logger: resolve program name using RunMode and BuildInfo --- src/common/logger.cpp | 17 +++++++++++++++-- src/common/logger.h | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/common/logger.cpp b/src/common/logger.cpp index 031aa5e0..d17e1822 100644 --- a/src/common/logger.cpp +++ b/src/common/logger.cpp @@ -127,9 +127,22 @@ void Logger::setup(bool keepMessages) #ifdef HAVE_SYSLOG _syslogEnabled = Quassel::isOptionSet("syslog"); + Quassel::RunMode mode = Quassel::runMode(); + Quassel::BuildInfo info = Quassel::buildInfo(); + QString prgname = info.applicationName; + + if (mode == Quassel::RunMode::ClientOnly) { + prgname = info.clientApplicationName; + } else if (mode == Quassel::RunMode::CoreOnly) { + prgname = info.coreApplicationName; + } + + _prgname = prgname.toLocal8Bit(); + // set up options, program name, and facility for later calls to syslog(3) - if (_syslogEnabled) - openlog("quasselcore", LOG_PID, LOG_USER); + if (_syslogEnabled) { + openlog(_prgname.constData(), LOG_PID, LOG_USER); + } #endif _initialized = true; diff --git a/src/common/logger.h b/src/common/logger.h index 3755abff..7b88078f 100644 --- a/src/common/logger.h +++ b/src/common/logger.h @@ -111,6 +111,7 @@ private: std::vector _messages; bool _keepMessages{true}; bool _initialized{false}; + QByteArray _prgname; }; Q_DECLARE_METATYPE(Logger::LogEntry) -- 2.20.1