diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp index 7ae6f4210..e9259b75f 100644 --- a/src/lib/gui/core/CoreProcess.cpp +++ b/src/lib/gui/core/CoreProcess.cpp @@ -367,18 +367,20 @@ void CoreProcess::start(std::optional processModeOption) if (mode() == Server) { args.prepend(QStringLiteral("server")); - if (!addServerArgs(args)) + if (!addServerArgs()) qWarning("failed to add server args for core process, aborting start"); } else if (mode() == Client) { args.prepend(QStringLiteral("client")); - if (!addClientArgs(args)) - qWarning("failed to add client args for core process, aborting start"); } qDebug().noquote() << "log level:" << Settings::logLevelText(); - if (Settings::value(Settings::Log::ToFile).toBool()) - qInfo().noquote() << "log file:" << Settings::value(Settings::Log::File).toString(); + if (Settings::value(Settings::Log::ToFile).toBool()) { + persistLogDir(); + const auto logFile = Settings::value(Settings::Log::File).toString(); + args.append({QStringLiteral("--log"), logFile}); + qInfo().noquote() << "log file:" << logFile; + } if (processMode == ProcessMode::Desktop) { startForegroundProcess(args); @@ -454,13 +456,8 @@ void CoreProcess::cleanup() } } -bool CoreProcess::addServerArgs(QStringList &args) +bool CoreProcess::addServerArgs() { - if (Settings::value(Settings::Log::ToFile).toBool()) { - persistLogDir(); - args << "--log" << Settings::value(Settings::Log::File).toString(); - } - QString configFilename = persistServerConfig(); if (configFilename.isEmpty()) { qFatal("config file name empty for server args"); @@ -474,16 +471,6 @@ bool CoreProcess::addServerArgs(QStringList &args) return true; } -bool CoreProcess::addClientArgs(QStringList &args) -{ - if (Settings::value(Settings::Log::ToFile).toBool()) { - persistLogDir(); - args << "--log" << Settings::value(Settings::Log::File).toString(); - } - - return true; -} - QString CoreProcess::persistServerConfig() const { if (Settings::value(Settings::Server::ExternalConfig).toBool()) { diff --git a/src/lib/gui/core/CoreProcess.h b/src/lib/gui/core/CoreProcess.h index 2e0d5f987..ef1b4c512 100644 --- a/src/lib/gui/core/CoreProcess.h +++ b/src/lib/gui/core/CoreProcess.h @@ -115,8 +115,7 @@ private: void startProcessFromDaemon(const QStringList &args); void stopForegroundProcess() const; void stopProcessFromDaemon(); - bool addServerArgs(QStringList &args); - bool addClientArgs(QStringList &args); + bool addServerArgs(); QString persistServerConfig() const; QString modeString() const; QString processModeString() const;