smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: CoreProcess append log option in start Method, remove now unused addClientArgs , and args parameter from addServerArgs

Browse source
This commit is contained in:
sithlord48 2025-10-10 13:55:44 -04:00 committed by Chris Rizzitello
parent e3f940c70a
commit bd0c5a68f1
2 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/lib/gui/core/CoreProcess.cpp
View file

@ -367,18 +367,20 @@ void CoreProcess::start(std::optional<ProcessMode> processModeOption)
if (mode() == Server) { if (mode() == Server) {
args.prepend(QStringLiteral("server")); args.prepend(QStringLiteral("server"));
if (!addServerArgs(args)) if (!addServerArgs())
qWarning("failed to add server args for core process, aborting start"); qWarning("failed to add server args for core process, aborting start");
} else if (mode() == Client) { } else if (mode() == Client) {
args.prepend(QStringLiteral("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(); qDebug().noquote() << "log level:" << Settings::logLevelText();
if (Settings::value(Settings::Log::ToFile).toBool()) if (Settings::value(Settings::Log::ToFile).toBool()) {
qInfo().noquote() << "log file:" << Settings::value(Settings::Log::File).toString(); persistLogDir();
const auto logFile = Settings::value(Settings::Log::File).toString();
args.append({QStringLiteral("--log"), logFile});
qInfo().noquote() << "log file:" << logFile;
}
if (processMode == ProcessMode::Desktop) { if (processMode == ProcessMode::Desktop) {
startForegroundProcess(args); 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(); QString configFilename = persistServerConfig();
if (configFilename.isEmpty()) { if (configFilename.isEmpty()) {
qFatal("config file name empty for server args"); qFatal("config file name empty for server args");
@ -474,16 +471,6 @@ bool CoreProcess::addServerArgs(QStringList &args)
return true; 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 QString CoreProcess::persistServerConfig() const
{ {
if (Settings::value(Settings::Server::ExternalConfig).toBool()) { if (Settings::value(Settings::Server::ExternalConfig).toBool()) {

3
src/lib/gui/core/CoreProcess.h
View file

@ -115,8 +115,7 @@ private:
void startProcessFromDaemon(const QStringList &args); void startProcessFromDaemon(const QStringList &args);
void stopForegroundProcess() const; void stopForegroundProcess() const;
void stopProcessFromDaemon(); void stopProcessFromDaemon();
bool addServerArgs(QStringList &args); bool addServerArgs();
bool addClientArgs(QStringList &args);
QString persistServerConfig() const; QString persistServerConfig() const;
QString modeString() const; QString modeString() const;
QString processModeString() const; QString processModeString() const;