lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.cpp
+24 -25
View File
@@ -17,8 +17,7 @@
int ServiceManagement::ServiceProcess::s_serviceProcessIdCounter = 0;
ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData, ServiceManagement::Service *parentService)
: QProcess(parentService)
ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData, ServiceManagement::Service *parentService) : QProcess(parentService)
, m_serviceId(parentService->id())
, m_serviceProcessId(s_serviceProcessIdCounter++)
, m_abbreviation(parentService->abbreviation())
@@ -33,8 +32,8 @@ ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData,
, m_isInDevMode(parentService->devMode())
, m_failedStartAttemptCounter(0)
, m_stoppedFromRequest(false)
, m_pidProc(new QProcess(this))
{
, m_pidProc(new QProcess(this)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
QStringLiteral("-d"), QString::number(m_groupData.domainId())});
@@ -59,7 +58,7 @@ ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData,
#ifndef LTS_DEBUG
if (m_name == QStringLiteral("HighLevelArchitecture"))
{
DEBUG_LOG() <<" START HLA REMOTE";
DEBUG_LOG(m_logger) <<" START HLA REMOTE";
killallRemote();
//QString sshCmd = QStringLiteral("ssh ctcap03 '/shd/CTC/SV/bin/svcHighLevelArchitecture %1 &'").arg(arguments().join(QLatin1Char(' ')));
@@ -73,7 +72,7 @@ ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData,
if (m_name == QStringLiteral("Buildings"))
{
DEBUG_LOG() <<" START Buildings Remote";
DEBUG_LOG(m_logger) <<" START Buildings Remote";
killallRemote();
//QString sshCmd = QStringLiteral("ssh ctcap03 '/shd/CTC/SV/bin/svcHighLevelArchitecture %1 &'").arg(arguments().join(QLatin1Char(' ')));
@@ -116,7 +115,7 @@ Core::RunningState ServiceManagement::ServiceProcess::runningState() const
bool ServiceManagement::ServiceProcess::start(OpenMode mode)
{
DEBUG_LOG() << "Starting ServiceProcess "
DEBUG_LOG(m_logger) << "Starting ServiceProcess "
<< debugInfo()
<< " executable: " << program()
<< " in dir: " << workingDirectory()
@@ -129,10 +128,10 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
#ifndef LTS_DEBUG
if (m_name == QStringLiteral("HighLevelArchitecture"))
{
DEBUG_LOG() <<" START HLA REMOTE";
DEBUG_LOG(m_logger) <<" START HLA REMOTE";
//QString sshCmd = QStringLiteral("ssh ctcap03 '/shd/CTC/SV/bin/svcHighLevelArchitecture %1 &echo $! '").arg(arguments().join(QLatin1Char(' ')));
//DEBUG_LOG() << sshCmd;
//DEBUG_LOG(m_logger) << sshCmd;
setProgram(QStringLiteral("ssh"));
if (state() == QProcess::NotRunning)
@@ -140,11 +139,11 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
QProcess::start(mode);
waitForStarted(5000);
}
DEBUG_LOG() << program() << " " << arguments().join(QLatin1Char(' '));
DEBUG_LOG(m_logger) << program() << " " << arguments().join(QLatin1Char(' '));
m_pidProc->kill();
m_pidProc->setProgram(QStringLiteral("ssh"));
//DEBUG_LOG() << sshCmd;
//DEBUG_LOG(m_logger) << sshCmd;
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
QStringLiteral("-d"), QString::number(m_groupData.domainId())});
setProgram(QStringLiteral("ssh"));
@@ -169,26 +168,26 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
m_pidProc->waitForReadyRead(5000);
});
DEBUG_LOG() << m_pidProc->program() << " " << m_pidProc->arguments().join(QLatin1Char(' '));
DEBUG_LOG(m_logger) << m_pidProc->program() << " " << m_pidProc->arguments().join(QLatin1Char(' '));
}else if (m_name == QStringLiteral("Buildings"))
{
DEBUG_LOG() <<" START Buildings REMOTE";
DEBUG_LOG(m_logger) <<" START Buildings REMOTE";
setProgram(QStringLiteral("ssh"));
//QString sshCmd = QStringLiteral("ssh ctcap03 '/shd/CTC/SV/bin/svcHighLevelArchitecture %1 &echo $! '").arg(arguments().join(QLatin1Char(' ')));
//DEBUG_LOG() << sshCmd;
//DEBUG_LOG(m_logger) << sshCmd;
if (state() == QProcess::NotRunning)
{
QProcess::start(mode);
waitForStarted(5000);
}
DEBUG_LOG() << program() << " " << arguments().join(QLatin1Char(' '));
DEBUG_LOG(m_logger) << program() << " " << arguments().join(QLatin1Char(' '));
m_pidProc->kill();
m_pidProc->setProgram(QStringLiteral("ssh"));
//DEBUG_LOG() << sshCmd;
//DEBUG_LOG(m_logger) << sshCmd;
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
QStringLiteral("-d"), QString::number(m_groupData.domainId())});
setProgram(QStringLiteral("ssh"));
@@ -215,7 +214,7 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
m_pidProc->waitForReadyRead(5000);
});
DEBUG_LOG() << m_pidProc->program() << " " << m_pidProc->arguments().join(QLatin1Char(' '));
DEBUG_LOG(m_logger) << m_pidProc->program() << " " << m_pidProc->arguments().join(QLatin1Char(' '));
}
else
#endif
@@ -230,7 +229,7 @@ bool ServiceManagement::ServiceProcess::start(OpenMode mode)
}
else
{
ERROR_LOG() << "Could not start service "
ERROR_LOG(m_logger) << "Could not start service "
<< debugInfo()
<< " because there is no licence for it.";
return false;
@@ -244,7 +243,7 @@ int ServiceManagement::ServiceProcess::serviceProcessId() const
void ServiceManagement::ServiceProcess::setNewStateFromHeartbeat(const Core::CurrentRunningState &data)
{
DEBUG_LOG() << "Heartbeat for " << debugInfo() << ", running state: " << data.runningState();
DEBUG_LOG(m_logger) << "Heartbeat for " << debugInfo() << ", running state: " << data.runningState();
m_failedStartAttemptCounter = 0;
m_lastHeartbeatMSec = QDateTime::currentMSecsSinceEpoch();
m_runningState = data.runningState();
@@ -287,7 +286,7 @@ void ServiceManagement::ServiceProcess::killallRemote()
sh.startDetached();
#else
sh.start();
#endif DEBUG_LOG() << "kill remote " << sh.program() << " " << args.join(QLatin1Char(' '));
#endif DEBUG_LOG(m_logger) << "kill remote " << sh.program() << " " << args.join(QLatin1Char(' '));
}
void ServiceManagement::ServiceProcess::restart()
@@ -420,7 +419,7 @@ void ServiceManagement::ServiceProcess::setNewStateFromChangeRequest(const Core:
void ServiceManagement::ServiceProcess::onNewInfoFromProc(ProcessState state)
{
DEBUG_LOG() << "New state for " << debugInfo() << ": " << state;
DEBUG_LOG(m_logger) << "New state for " << debugInfo() << ": " << state;
QString errString;
switch (state)
{
@@ -428,10 +427,10 @@ void ServiceManagement::ServiceProcess::onNewInfoFromProc(ProcessState state)
if (exitStatus() == QProcess::NormalExit)
{
if (exitCode() == 0)
DEBUG_LOG() << "Normal exit for " << debugInfo()
DEBUG_LOG(m_logger) << "Normal exit for " << debugInfo()
<< ": " << readAllStandardError() << ", " << readAllStandardOutput();
else
ERROR_LOG() << "Normal exit with exit code " << exitCode() << " for " << debugInfo()
ERROR_LOG(m_logger) << "Normal exit with exit code " << exitCode() << " for " << debugInfo()
<< ": " << readAllStandardError() << ", " << readAllStandardOutput();
m_runningState = Core::RunningState::StoppedNormally;
}
@@ -452,7 +451,7 @@ void ServiceManagement::ServiceProcess::onNewInfoFromProc(ProcessState state)
m_runningState = Core::RunningState::StoppedError;
}
errString += QLatin1String(" error string: ") + errorString();
ERROR_LOG() << "Crashed Error for " << debugInfo() << ", error: " << errorString() << ":\n"
ERROR_LOG(m_logger) << "Crashed Error for " << debugInfo() << ", error: " << errorString() << ":\n"
<< readAll();
}
m_parentService->licenceDonator()->freeLicence(m_name);
@@ -463,7 +462,7 @@ void ServiceManagement::ServiceProcess::onNewInfoFromProc(ProcessState state)
m_runningState = Core::RunningState::Starting;
break;
case QProcess::Running:
DEBUG_LOG() << "Process " << m_name
DEBUG_LOG(m_logger) << "Process " << m_name
<< " has now the PID " << usablePid();
}