Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -52,17 +52,17 @@ bool HandlerIed::init()
|
||||
m_ppmDtc = ParticipantManagement::Interface::Dtc::create(m_ddsHandler->dds());
|
||||
if (!m_ppmDtc->enableParticipantPosition())
|
||||
{
|
||||
ERROR_LOG() << "PPM DTC enableParticipantPosition() failed.";
|
||||
ERROR_LOG(m_logger) << "PPM DTC enableParticipantPosition() failed.";
|
||||
return false;
|
||||
}
|
||||
if (!m_ppmDtc->enableParticipant())
|
||||
{
|
||||
ERROR_LOG() << "PPM DTC enableParticipant() failed.";
|
||||
ERROR_LOG(m_logger) << "PPM DTC enableParticipant() failed.";
|
||||
return false;
|
||||
}
|
||||
if (!m_ppmDtc->enableParty())
|
||||
{
|
||||
ERROR_LOG() << "PPM DTC enableParty() failed.";
|
||||
ERROR_LOG(m_logger) << "PPM DTC enableParty() failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ bool HandlerIed::init()
|
||||
// read all Ieds from database
|
||||
if (!m_db->select(dataVec))
|
||||
{
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -82,13 +82,13 @@ bool HandlerIed::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
return false;
|
||||
}
|
||||
m_iedObjMap.insert(ifs->getId(), ifs);
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "m_exeObjMap.size() = " << m_iedObjMap.size();
|
||||
DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_iedObjMap.size();
|
||||
|
||||
// Initialize RecordReplay to get initial IedPosition
|
||||
RecordReplayPlugin recordReplay;
|
||||
@@ -101,7 +101,7 @@ bool HandlerIed::init()
|
||||
// key is sampleTime -> multiMap
|
||||
QMultiMap<qint64, GuezIedManagement::IedPosition> latestPositions = recordReplay.getIedPositionMap();
|
||||
|
||||
DEBUG_LOG() << "Starting to read IED positions from record replay. Size: "
|
||||
DEBUG_LOG(m_logger) << "Starting to read IED positions from record replay. Size: "
|
||||
<< latestPositions.size();
|
||||
|
||||
for (auto it = latestPositions.begin(); it != latestPositions.end(); ++it)
|
||||
@@ -111,10 +111,10 @@ bool HandlerIed::init()
|
||||
|
||||
if (currentIed == nullptr)
|
||||
{
|
||||
INFO_LOG() << "Got position for non existing IED-Id: " << pos.id();
|
||||
INFO_LOG(m_logger) << "Got position for non existing IED-Id: " << pos.id();
|
||||
continue;
|
||||
}
|
||||
DEBUG_LOG() << "Setting position for IED-Id " << pos.id();
|
||||
DEBUG_LOG(m_logger) << "Setting position for IED-Id " << pos.id();
|
||||
currentIed->setPosition(it.value());
|
||||
}
|
||||
|
||||
@@ -123,7 +123,7 @@ bool HandlerIed::init()
|
||||
if (!m_tabDtc->enableDefinitionIed() ||
|
||||
!m_tabDtc->enableStateIed())
|
||||
{
|
||||
ERROR_LOG() << "Could not initialize TraininAreaBase data topic client";
|
||||
ERROR_LOG(m_logger) << "Could not initialize TraininAreaBase data topic client";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -177,7 +177,7 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da
|
||||
if (modType != DataModification::eAdded && modType != DataModification::eModified)
|
||||
return;
|
||||
|
||||
DEBUG_LOG() << "onDefinitionIed: " << data;
|
||||
DEBUG_LOG(m_logger) << "onDefinitionIed: " << data;
|
||||
|
||||
Database::GimIed newData;
|
||||
|
||||
@@ -237,7 +237,7 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
return;
|
||||
}
|
||||
m_iedObjMap.insert(ifs->getId(), ifs);
|
||||
@@ -276,7 +276,7 @@ void HandlerIed::onStateIed(const TrainingAreaBase::StateIed &data, DataModifica
|
||||
if (modType != DataModification::eAdded && modType != DataModification::eModified)
|
||||
return;
|
||||
|
||||
DEBUG_LOG() << "onStateIed: " << data;
|
||||
DEBUG_LOG(m_logger) << "onStateIed: " << data;
|
||||
|
||||
// only overwrite state for existing IEDs
|
||||
if (m_iedObjMap.contains(getIdByEquipmentnumber(data.iedId())))
|
||||
@@ -294,7 +294,7 @@ void HandlerIed::onStateIed(const TrainingAreaBase::StateIed &data, DataModifica
|
||||
}
|
||||
else
|
||||
{
|
||||
WARNING_LOG() << "StateIed without an existing IED - got no DefinitionIED? " << data;
|
||||
WARNING_LOG(m_logger) << "StateIed without an existing IED - got no DefinitionIED? " << data;
|
||||
m_orphanedStateIed.insert(data.iedId(), data);
|
||||
}
|
||||
}
|
||||
@@ -304,7 +304,7 @@ void HandlerIed::onPairIedRequest(const rti::core::SampleIdentity &cookie,
|
||||
{
|
||||
Core::FunctionReplyObject ret;
|
||||
|
||||
INFO_LOG() << "onPairIedRequest id = " << request.id();
|
||||
INFO_LOG(m_logger) << "onPairIedRequest id = " << request.id();
|
||||
|
||||
ObjectIed *ifs = m_iedObjMap.value(request.id());
|
||||
if (ifs == nullptr)
|
||||
@@ -336,7 +336,7 @@ void HandlerIed::onPairIedRequest(const rti::core::SampleIdentity &cookie,
|
||||
|
||||
ret = ifs->updatePairingState(data);
|
||||
if (ret.error())
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
|
||||
m_ddsHandler->fts()->pairIedReply(cookie, ret);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user