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

refactor: CoreProcess::start seed args with value of coreMode, use it when checking if server

Browse source
This commit is contained in:
sithlord48 2025-10-10 15:19:29 -04:00 committed by Chris Rizzitello
parent 5a632bbb6d
commit 48195f9347
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -316,8 +316,6 @@ void CoreProcess::handleLogLines(const QString &text)
void CoreProcess::start(std::optional<ProcessMode> processModeOption) void CoreProcess::start(std::optional<ProcessMode> processModeOption)
{ {
using enum Settings::CoreMode;
if (m_processState == ProcessState::Started) { if (m_processState == ProcessState::Started) {
qCritical("core process already started"); qCritical("core process already started");
return; return;
@ -332,7 +330,7 @@ void CoreProcess::start(std::optional<ProcessMode> processModeOption)
const auto currentMode = Settings::value(Settings::Core::ProcessMode).value<ProcessMode>(); const auto currentMode = Settings::value(Settings::Core::ProcessMode).value<ProcessMode>();
const auto processMode = processModeOption.value_or(currentMode); const auto processMode = processModeOption.value_or(currentMode);
const auto coreMode = m_mode == Server ? QStringLiteral("server") : QStringLiteral("client"); const auto coreMode = QVariant::fromValue(m_mode).toString().toLower();
qInfo().noquote() << QString("starting %1 process (%2 mode)").arg(coreMode, processModeToString(processMode)); qInfo().noquote() << QString("starting %1 process (%2 mode)").arg(coreMode, processModeToString(processMode));
@ -363,18 +361,15 @@ void CoreProcess::start(std::optional<ProcessMode> processModeOption)
); );
} }
QStringList args; QStringList args = {coreMode};
if (mode() == Server) { if (m_mode == Settings::CoreMode::Server) {
args.prepend(QStringLiteral("server"));
const auto configFilename = persistServerConfig(); const auto configFilename = persistServerConfig();
if (configFilename.isEmpty()) { if (configFilename.isEmpty()) {
qFatal("config file name empty for server args"); qFatal("config file name empty for server args");
return; return;
} }
qInfo("core config file: %s", qPrintable(configFilename)); qInfo("core config file: %s", qPrintable(configFilename));
} else if (mode() == Client) {
args.prepend(QStringLiteral("client"));
} }
qDebug().noquote() << "log level:" << Settings::logLevelText(); qDebug().noquote() << "log level:" << Settings::logLevelText();