Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -103,7 +103,7 @@ QString SaaChooser::rdesktopCodeToString(RdesktopCodes code)
|
||||
|
||||
SaaChooser::RdesktopCodes SaaChooser::getRdesktopInterpretation(int code) const
|
||||
{
|
||||
DEBUG_LOG()<<">> getRdesktopInterpretation: rdesktop error code: "<<code;
|
||||
DEBUG_LOG(m_logger)<<">> getRdesktopInterpretation: rdesktop error code: "<<code;
|
||||
switch (code)
|
||||
{
|
||||
case 0:
|
||||
@@ -129,7 +129,7 @@ SaaChooser::RdesktopCodes SaaChooser::getRdesktopInterpretation(int code) const
|
||||
|
||||
bool SaaChooser::normalExit(int code) const
|
||||
{
|
||||
DEBUG_LOG()<<">> process finished!! exitCode: "<<code;
|
||||
DEBUG_LOG(m_logger)<<">> process finished!! exitCode: "<<code;
|
||||
return getRdesktopInterpretation(code) == RdesktopCodes::Normal;
|
||||
}
|
||||
|
||||
@@ -175,7 +175,7 @@ void SaaChooser::slotSelectSaa()
|
||||
{
|
||||
if (process != qobject_cast<QProcess *>(sender()) || process.isNull())
|
||||
return;
|
||||
ERROR_LOG() << ">> SAA Remote desktop: error:" << process->readAllStandardError();
|
||||
ERROR_LOG(m_logger) << ">> SAA Remote desktop: error:" << process->readAllStandardError();
|
||||
});
|
||||
|
||||
|
||||
@@ -184,7 +184,7 @@ void SaaChooser::slotSelectSaa()
|
||||
{
|
||||
if (process != qobject_cast<QProcess *>(sender()) || process.isNull())
|
||||
return;
|
||||
INFO_LOG() << ">> SAA Remote desktop: " << process->readAllStandardOutput();
|
||||
INFO_LOG(m_logger) << ">> SAA Remote desktop: " << process->readAllStandardOutput();
|
||||
});
|
||||
|
||||
|
||||
@@ -196,7 +196,7 @@ void SaaChooser::slotSelectSaa()
|
||||
if (process->state() != QProcess::Running)
|
||||
LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
|
||||
|
||||
WARNING_LOG()<<">> saa with id ("<<asset.id()<<")"<<" started ";
|
||||
WARNING_LOG(m_logger)<<">> saa with id ("<<asset.id()<<")"<<" started ";
|
||||
|
||||
});
|
||||
|
||||
@@ -204,7 +204,7 @@ void SaaChooser::slotSelectSaa()
|
||||
connect(process, &QProcess::started,
|
||||
this, [this, asset]()
|
||||
{
|
||||
WARNING_LOG()<<">> saa with id ("<<asset.id()<<")"<<" started ";
|
||||
WARNING_LOG(m_logger)<<">> saa with id ("<<asset.id()<<")"<<" started ";
|
||||
|
||||
LtsWidgets::LtsGlobalWaitDialog::getInstance()->done();
|
||||
|
||||
@@ -219,11 +219,11 @@ void SaaChooser::slotSelectSaa()
|
||||
<< QStringLiteral("-p")<< assetProps.password
|
||||
<< saaIp;
|
||||
|
||||
DEBUG_LOG()<<">> Process rdesktop: "<<args.join(QStringLiteral(" "));
|
||||
DEBUG_LOG(m_logger)<<">> Process rdesktop: "<<args.join(QStringLiteral(" "));
|
||||
process->start(program, args);
|
||||
if (!process->waitForStarted())
|
||||
{
|
||||
ERROR_LOG() << "Could not start saa process "<<process->program() <<" " << process->arguments().join(QStringLiteral(" "));
|
||||
ERROR_LOG(m_logger) << "Could not start saa process "<<process->program() <<" " << process->arguments().join(QStringLiteral(" "));
|
||||
process->deleteLater();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,6 +62,7 @@ private slots:
|
||||
void enaDisa();
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void tableColumnOrganiserSetting() override;
|
||||
|
||||
Ui::SaaChooser *m_ui;
|
||||
|
||||
@@ -17,30 +17,30 @@ SaaDialogModel::SaaDialogModel(QObject *parent)
|
||||
: LtsWidgets::LtsAbstractTableModel<AssetManagement::Asset>({tr("Id"), tr("Name"), tr("scenario is running"), tr("Used by Party")}, parent)
|
||||
, m_ppmDtc(nullptr)
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
SaaDialogModel::~SaaDialogModel()
|
||||
{
|
||||
stopPing();
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
bool SaaDialogModel::initModel(LtsSession::LtsSession *session)
|
||||
{
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
m_session = session;
|
||||
|
||||
if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
|
||||
{
|
||||
ERROR_LOG() << " ppmDtc not set!!! " << m_logger.getLoggerName();
|
||||
ERROR_LOG(m_logger) << " ppmDtc not set!!! " << m_logger.getLoggerName();
|
||||
return false;
|
||||
}
|
||||
if (!m_session->getDtc<AssetManagement::DataInterface>(m_asmDtc))
|
||||
{
|
||||
ERROR_LOG() << " asmDtc not set!!! " << m_logger.getLoggerName();
|
||||
ERROR_LOG(m_logger) << " asmDtc not set!!! " << m_logger.getLoggerName();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -67,13 +67,13 @@ bool SaaDialogModel::initModel(LtsSession::LtsSession *session)
|
||||
onDataChanged(asset, DataModification::eAdded);
|
||||
});
|
||||
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
return true;
|
||||
}
|
||||
|
||||
void SaaDialogModel::pingAllSaa()
|
||||
{
|
||||
DEBUG_LOG() << "====> pingAllSaa: saaList count: " << m_saaPingItems.count();
|
||||
DEBUG_LOG(m_logger) << "====> pingAllSaa: saaList count: " << m_saaPingItems.count();
|
||||
|
||||
if (m_saaPingItems.isEmpty())
|
||||
return;
|
||||
@@ -98,7 +98,7 @@ void SaaDialogModel::pingAllSaa()
|
||||
{
|
||||
ParticipantManagement::Party party;
|
||||
getPartyWithAssetId(pi.assetId, party);
|
||||
DEBUG_LOG() << " ping assetId: " << pi.assetId << " reacheable ? " << (exitCode == 0) << " Szenar ? " << (party.id() > 0) << " Ip: " << pi.host
|
||||
DEBUG_LOG(m_logger) << " ping assetId: " << pi.assetId << " reacheable ? " << (exitCode == 0) << " Szenar ? " << (party.id() > 0) << " Ip: " << pi.host
|
||||
<< " PortNumb: " << pi.port;
|
||||
pi.reachable = (exitCode == 0);
|
||||
pi.process->kill();
|
||||
@@ -122,13 +122,13 @@ void SaaDialogModel::saaConnected(int assetId, bool state)
|
||||
|
||||
void SaaDialogModel::stopPing()
|
||||
{
|
||||
WARNING_LOG() << ">> stop ping saa...";
|
||||
WARNING_LOG(m_logger) << ">> stop ping saa...";
|
||||
for (auto &pi : m_saaPingItems)
|
||||
{
|
||||
|
||||
if (pi.process)
|
||||
{
|
||||
WARNING_LOG() << ">> kill process saaId: " << pi.assetId;
|
||||
WARNING_LOG(m_logger) << ">> kill process saaId: " << pi.assetId;
|
||||
pi.process->kill();
|
||||
pi.process->deleteLater();
|
||||
pi.process = nullptr;
|
||||
@@ -146,7 +146,7 @@ void SaaDialogModel::updateView()
|
||||
void SaaDialogModel::onPartyDataChanged(const ParticipantManagement::Party &data, DataModification modType)
|
||||
{
|
||||
Q_UNUSED(modType)
|
||||
DEBUG_LOG() << ">>> SAA Dialog Party Data Changed: " << data.id() << " properties: " << data.properties();
|
||||
DEBUG_LOG(m_logger) << ">>> SAA Dialog Party Data Changed: " << data.id() << " properties: " << data.properties();
|
||||
update();
|
||||
}
|
||||
|
||||
|
||||
@@ -41,6 +41,7 @@ public:
|
||||
void pingAllSaa();
|
||||
void saaConnected(int assetId, bool state);
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void stopPing();
|
||||
void updateView();
|
||||
void onPartyDataChanged(const ParticipantManagement::Party &data, DataModification modType);
|
||||
|
||||
Reference in new issue
Block a user