Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -13,17 +13,17 @@ using namespace CodificationManagement;
|
||||
DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
|
||||
: m_ddsConnector(ddsConnector)
|
||||
{
|
||||
DEBUG_LOG() << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
INFO_LOG() << "--- Start CodificationManagement DDSHandler.";
|
||||
INFO_LOG(m_logger) << "--- Start CodificationManagement DDSHandler.";
|
||||
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -35,12 +35,12 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
// DTS
|
||||
m_ddsDts = CodificationManagement::Interface::Dts::create(m_ddsConnector);
|
||||
bool bRet = m_ddsDts->enableAll();
|
||||
INFO_LOG() << "Dts initialised";
|
||||
INFO_LOG(m_logger) << "Dts initialised";
|
||||
|
||||
// FTS
|
||||
m_ddsFts = CodificationManagement::Interface::Fts::create(m_ddsConnector);
|
||||
bRet &= m_ddsFts->enableAll();
|
||||
INFO_LOG() << "Fts initialised";
|
||||
INFO_LOG(m_logger) << "Fts initialised";
|
||||
|
||||
return bRet;
|
||||
} // end of init()
|
||||
|
||||
@@ -33,6 +33,7 @@ public:
|
||||
int exerciseId() const;
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<Core::TopicLockMaster> m_topicLockMaster;
|
||||
std::shared_ptr<CodificationManagement::Interface::Dts> m_ddsDts;
|
||||
|
||||
+8
-8
@@ -34,7 +34,7 @@ bool HandlerCodificationData::init()
|
||||
// read all CodificationDatas from database
|
||||
if (!m_dbHandler->db()->select(dataVec))
|
||||
{
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -47,13 +47,13 @@ bool HandlerCodificationData::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
return false;
|
||||
}
|
||||
m_codificationdataObjMap.insert(ifs->getId(), ifs);
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "m_codificationdataObjMap.size() = " << m_codificationdataObjMap.size();
|
||||
DEBUG_LOG(m_logger) << "m_codificationdataObjMap.size() = " << m_codificationdataObjMap.size();
|
||||
|
||||
return true;
|
||||
} // end of init()
|
||||
@@ -62,10 +62,10 @@ bool HandlerCodificationData::init()
|
||||
void HandlerCodificationData::onCodificationDataModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const CodificationData &request)
|
||||
{
|
||||
DEBUG_LOG() << "onCodificationDataModifyRequest: " << request;
|
||||
DEBUG_LOG(m_logger) << "onCodificationDataModifyRequest: " << request;
|
||||
auto ret = request.id() > 0 ? codificationDataModifyRequest(request) : codificationDataCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG() << ret();
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_ddsHandler->fts()->codificationDataModifyReply(cookie, ret);
|
||||
} // end of onCodificationDataModifyRequest()
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -96,14 +96,14 @@ Core::FunctionReplyObject HandlerCodificationData::codificationDataModifyRequest
|
||||
void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onCodificationDataRemoveRequest: " << request;
|
||||
DEBUG_LOG(m_logger) << "onCodificationDataRemoveRequest: " << request;
|
||||
|
||||
|
||||
ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id());
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Codification table with id %1 not found")).arg(request.id());
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -117,7 +117,7 @@ void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::S
|
||||
|
||||
Core::FunctionReplyObject ret = ifs->removeObject();
|
||||
if (ret.error())
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
else
|
||||
{
|
||||
// delete codification object
|
||||
|
||||
+3
@@ -30,6 +30,9 @@ public:
|
||||
|
||||
|
||||
private: // FTS methods
|
||||
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void onCodificationDataModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const CodificationData &request) override final;
|
||||
Core::FunctionReplyObject codificationDataCreateRequest(const CodificationData &request);
|
||||
|
||||
+5
-5
@@ -33,13 +33,13 @@ Initialization::~Initialization()
|
||||
bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector,
|
||||
const QSqlDatabase &sqlDb)
|
||||
{
|
||||
INFO_LOG() << "Start CodificationManagement Initialization.";
|
||||
INFO_LOG(m_logger) << "Start CodificationManagement Initialization.";
|
||||
|
||||
// initialize DDS
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(ddsConnector);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialisation DdsHandler failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -47,14 +47,14 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
|
||||
m_dbHandler = std::make_shared<DbHandler>();
|
||||
if (!m_dbHandler->init(ddsConnector->getPartitionId(), sqlDb))
|
||||
{
|
||||
ERROR_LOG() << "Initialisation DbHandler failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
|
||||
return false;
|
||||
}
|
||||
|
||||
// create HandlerCodificationData
|
||||
m_handlerCodificationData.reset(new HandlerCodificationData(m_ddsHandler, m_dbHandler));
|
||||
|
||||
INFO_LOG() << "CodificationManagement Initialization initialized. pacemakerState: Running ";
|
||||
INFO_LOG(m_logger) << "CodificationManagement Initialization initialized. pacemakerState: Running ";
|
||||
|
||||
return true;
|
||||
} // end of init()
|
||||
@@ -66,7 +66,7 @@ bool Initialization::loadFromDatabase()
|
||||
return false;
|
||||
if (!m_handlerCodificationData->init())
|
||||
{
|
||||
ERROR_LOG() << "Initialisation HandlerCodificationData failed.";
|
||||
ERROR_LOG(m_logger) << "Initialisation HandlerCodificationData failed.";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -30,6 +30,8 @@ public:
|
||||
bool loadFromDatabase();
|
||||
|
||||
private: // attributes
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler; ///< Pointer to DDS handler
|
||||
std::shared_ptr<DbHandler> m_dbHandler; ///< Pointer to DB handler
|
||||
std::shared_ptr<HandlerCodificationData> m_handlerCodificationData; ///< Pointer to codification data handler
|
||||
|
||||
+8
-8
@@ -27,7 +27,7 @@ ObjectCodificationData::~ObjectCodificationData()
|
||||
|
||||
Core::FunctionReplyObject ObjectCodificationData::createObject(const CodificationData &ddsData)
|
||||
{
|
||||
DEBUG_LOG() << "ObjectCodificationData::createObject()";
|
||||
DEBUG_LOG(m_logger) << "ObjectCodificationData::createObject()";
|
||||
|
||||
m_ddsData = ddsData;
|
||||
if (m_ddsData.id() <= 0)
|
||||
@@ -41,7 +41,7 @@ Core::FunctionReplyObject ObjectCodificationData::createObject(const Codificatio
|
||||
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting codification_table data into database"));
|
||||
|
||||
m_ddsData.id(dbData.id);
|
||||
DEBUG_LOG() << "New codificationTable id: " << m_ddsData.id();
|
||||
DEBUG_LOG(m_logger) << "New codificationTable id: " << m_ddsData.id();
|
||||
}
|
||||
|
||||
// Publish Data via DTS
|
||||
@@ -53,7 +53,7 @@ Core::FunctionReplyObject ObjectCodificationData::createObject(const Codificatio
|
||||
|
||||
Core::FunctionReplyObject ObjectCodificationData::updateObject(const CodificationManagement::CodificationData &ddsData)
|
||||
{
|
||||
DEBUG_LOG() << "ObjectCodificationData::updateObject()";
|
||||
DEBUG_LOG(m_logger) << "ObjectCodificationData::updateObject()";
|
||||
|
||||
if (!isValid())
|
||||
return Core::FunctionReplyObject(ddsData.id(), tr_lts("dds", "Object not valid/blocked"));
|
||||
@@ -66,7 +66,7 @@ Core::FunctionReplyObject ObjectCodificationData::updateObject(const Codificatio
|
||||
return Core::FunctionReplyObject(ddsData.id(), tr_lts("dds", "Error updating codification_table data in database"));
|
||||
// update internal objectdata
|
||||
m_ddsData = ddsData;
|
||||
DEBUG_LOG() << "Data changed for codification_table id: " << m_ddsData.id();
|
||||
DEBUG_LOG(m_logger) << "Data changed for codification_table id: " << m_ddsData.id();
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
@@ -78,7 +78,7 @@ Core::FunctionReplyObject ObjectCodificationData::updateObject(const Codificatio
|
||||
|
||||
Core::FunctionReplyObject ObjectCodificationData::removeObject()
|
||||
{
|
||||
DEBUG_LOG() << "ObjectCodificationData::removeObject()";
|
||||
DEBUG_LOG(m_logger) << "ObjectCodificationData::removeObject()";
|
||||
|
||||
if (isUsed())
|
||||
return Core::FunctionReplyObject(m_ddsData.id(), tr_lts("dds", "codification_table data still in use"));
|
||||
@@ -86,7 +86,7 @@ Core::FunctionReplyObject ObjectCodificationData::removeObject()
|
||||
if (!m_dbHandler->db()->removeCodCodificationTable(m_ddsData.id()))
|
||||
return Core::FunctionReplyObject(m_ddsData.id(), tr_lts("dds", "codification_table with id %1 can not be removed")).arg(m_ddsData.id());
|
||||
|
||||
DEBUG_LOG() << "Removed codification_table id " << m_ddsData.id();
|
||||
DEBUG_LOG(m_logger) << "Removed codification_table id " << m_ddsData.id();
|
||||
m_ddsHandler->dts()->removeCodificationDataByKey(m_ddsData.id());
|
||||
|
||||
return Core::FunctionReplyObject(m_ddsData.id());
|
||||
@@ -95,10 +95,10 @@ Core::FunctionReplyObject ObjectCodificationData::removeObject()
|
||||
|
||||
void ObjectCodificationData::onPublishData()
|
||||
{
|
||||
INFO_LOG() << "Publish CodificationData data to dds (" << m_ddsData.id() << ") ...";
|
||||
INFO_LOG(m_logger) << "Publish CodificationData data to dds (" << m_ddsData.id() << ") ...";
|
||||
|
||||
if (!m_ddsHandler->dts()->publish(m_ddsData))
|
||||
ERROR_LOG() << "Error publishing CodificationData data to dds";
|
||||
ERROR_LOG(m_logger) << "Error publishing CodificationData data to dds";
|
||||
} // end of onPublishData()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
+1
@@ -40,6 +40,7 @@ public:
|
||||
static Database::CodCodificationTable toDbData(const CodificationManagement::CodificationData &ddsData); // dds -> db
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
void onPublishData();
|
||||
|
||||
private:
|
||||
|
||||
Reference in new issue
Block a user