Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
@@ -32,7 +32,7 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# generate msg_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcMsgCommon SHARED ${SRCS_common})
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcMsgCommon SHARED ${SRCS_common})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcMsgCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -61,7 +61,7 @@ SET(SRCS_client
|
||||
# generate msg_[d|f]tc_impl.[cpp|h]
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcMsgClient SHARED ${SRCS_client})
|
||||
NGL_ADD_LIBRARY2(AAR SV WS svcMsgClient SHARED ${SRCS_client})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcMsgClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -89,7 +89,7 @@ SET(SRCS_server
|
||||
# generate msg_[d|f]ts.h, msg_[d|f]ts_impl.[cpp|h]
|
||||
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV svcMsgServer SHARED ${SRCS_server})
|
||||
NGL_ADD_LIBRARY2(AAR SV svcMsgServer SHARED ${SRCS_server})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcMsgServer
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
|
||||
@@ -52,7 +52,6 @@ MsgTests::MsgTests(QObject *parent)
|
||||
, m_msgIdRecvMessage(3) // Result from last test
|
||||
, m_numberMessages(3) // Result from last test
|
||||
, m_testStep(TestCase::CreateOperator)
|
||||
, m_logger(getLogger("MsgTests"))
|
||||
{}
|
||||
|
||||
MsgTests::~MsgTests()
|
||||
@@ -60,7 +59,7 @@ MsgTests::~MsgTests()
|
||||
|
||||
bool MsgTests::init(int domainId, int testId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "init begin";
|
||||
INFO_LOG() << "init begin";
|
||||
|
||||
m_testId = testId;
|
||||
|
||||
@@ -80,7 +79,7 @@ bool MsgTests::init(int domainId, int testId)
|
||||
|
||||
void MsgTests::startTest()
|
||||
{
|
||||
INFO_LOG(m_logger) << "startTest m_testId=" << m_testId;
|
||||
INFO_LOG() << "startTest m_testId=" << m_testId;
|
||||
if (m_testId <= 1) // CreateOperatorMessage
|
||||
{
|
||||
m_testStep = TestCase::CreateOperator;
|
||||
@@ -110,7 +109,7 @@ void MsgTests::startTest()
|
||||
|
||||
void MsgTests::tryCreateOperatorMessage()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to send createRequest Operator Message";
|
||||
INFO_LOG() << "trying to send createRequest Operator Message";
|
||||
Messaging::AddressType receiverType;
|
||||
Messaging::AddressType senderType;
|
||||
|
||||
@@ -156,7 +155,7 @@ void MsgTests::tryCreateOperatorMessage()
|
||||
|
||||
if (!m_ftc->createOperatorMessageRequest(CreateOperatorMessageRequest(recipientIds, exerciseId, sender, subject, m_expectedMessage, senderType, receiverType), this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting create data";
|
||||
ERROR_LOG() << "Error requesting create data";
|
||||
failExit();
|
||||
}
|
||||
} // tryCreateOperatorMessage
|
||||
@@ -170,29 +169,29 @@ void MsgTests::checkMessageOnDdsAfterCreate()
|
||||
const QMap<int, Messaging::OperatorMessage> messages = m_dtc->operatorMessages();
|
||||
for (const auto &om : messages)
|
||||
{
|
||||
INFO_LOG(m_logger) << "checkMessageOnDdsAfterCreate om.id = " << om.id();
|
||||
INFO_LOG() << "checkMessageOnDdsAfterCreate om.id = " << om.id();
|
||||
|
||||
if (om.message() == m_expectedMessage)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "senderId: " << om.senderId() << ", recipientId: " << om.recipientId();
|
||||
DEBUG_LOG() << "senderId: " << om.senderId() << ", recipientId: " << om.recipientId();
|
||||
if (om.senderId() != 0 && om.recipientId() == 0)
|
||||
{
|
||||
m_msgIdSendMessage = om.id();
|
||||
DEBUG_LOG(m_logger) << "m_msgIdSendMessage=" << m_msgIdSendMessage;
|
||||
DEBUG_LOG() << "m_msgIdSendMessage=" << m_msgIdSendMessage;
|
||||
++m_messageCount;
|
||||
}
|
||||
|
||||
if (om.senderId() != 0 && om.recipientId() != 0)
|
||||
{
|
||||
m_msgIdRecvMessage = om.id();
|
||||
DEBUG_LOG(m_logger) << "m_msgIdRecvMessage=" << m_msgIdRecvMessage;
|
||||
DEBUG_LOG() << "m_msgIdRecvMessage=" << m_msgIdRecvMessage;
|
||||
++m_messageCount;
|
||||
}
|
||||
}
|
||||
// msg count == 3 -> one for sender, two for receiver
|
||||
if (m_messageCount == 3)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Success: receiving messages - got: " << m_messageCount << " expected: 3";
|
||||
INFO_LOG() << "Success: receiving messages - got: " << m_messageCount << " expected: 3";
|
||||
ExitSuccess();
|
||||
return;
|
||||
}
|
||||
@@ -204,7 +203,7 @@ void MsgTests::checkMessageOnDdsAfterCreate()
|
||||
return;
|
||||
}
|
||||
|
||||
ERROR_LOG(m_logger) << "Error receiving messages - got: " << m_messageCount << " expected: 3";
|
||||
ERROR_LOG() << "Error receiving messages - got: " << m_messageCount << " expected: 3";
|
||||
failExit();
|
||||
} // checkMessageOnDdsAfterCreate
|
||||
|
||||
@@ -212,7 +211,7 @@ void MsgTests::checkMessageOnDdsAfterModify()
|
||||
{
|
||||
// read from dds, check if data is as expected
|
||||
int isRead = 0;
|
||||
INFO_LOG(m_logger) << "checkMessageOnDdsAfterModify";
|
||||
INFO_LOG() << "checkMessageOnDdsAfterModify";
|
||||
m_dtc->waitForHistoricalDataOperatorMessage();
|
||||
const QMap<int, Messaging::OperatorMessage> messages = m_dtc->operatorMessages();
|
||||
switch (m_testStep)
|
||||
@@ -221,18 +220,18 @@ void MsgTests::checkMessageOnDdsAfterModify()
|
||||
{
|
||||
for (const auto &om : messages)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "om.id()=" << om.id() << " om.isRead()=" << om.isRead();
|
||||
DEBUG_LOG() << "om.id()=" << om.id() << " om.isRead()=" << om.isRead();
|
||||
if (om.id() == m_msgIdRecvMessage && om.isRead() == true)
|
||||
++isRead;
|
||||
}
|
||||
if (isRead == 1)
|
||||
{
|
||||
INFO_LOG(m_logger) << "modify messages isRead = TRUE: Success ";
|
||||
INFO_LOG() << "modify messages isRead = TRUE: Success ";
|
||||
ExitSuccess();
|
||||
return;
|
||||
}
|
||||
|
||||
ERROR_LOG(m_logger) << "Error modify messages - got: " << isRead << " expected: 1";
|
||||
ERROR_LOG() << "Error modify messages - got: " << isRead << " expected: 1";
|
||||
failExit();
|
||||
break;
|
||||
}
|
||||
@@ -240,34 +239,34 @@ void MsgTests::checkMessageOnDdsAfterModify()
|
||||
{
|
||||
// Message removed from DDS
|
||||
|
||||
DEBUG_LOG(m_logger) << "m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
|
||||
DEBUG_LOG() << "m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
|
||||
if (m_numberMessages > messages.size())
|
||||
{
|
||||
INFO_LOG(m_logger) << "modify messages isDeleted = TRUE: Success ";
|
||||
INFO_LOG() << "modify messages isDeleted = TRUE: Success ";
|
||||
ExitSuccess();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
ERROR_LOG(m_logger) << "Error modify messages - got: " << messages.size() << " expected less than " << m_numberMessages;
|
||||
ERROR_LOG() << "Error modify messages - got: " << messages.size() << " expected less than " << m_numberMessages;
|
||||
failExit();
|
||||
break;
|
||||
}
|
||||
case TestCase::SendToTetra:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "SendToTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
|
||||
DEBUG_LOG() << "SendToTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
|
||||
ExitSuccess();
|
||||
break;
|
||||
}
|
||||
case TestCase::ReceiveFromTetra:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ReceiveFromTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
|
||||
DEBUG_LOG() << "ReceiveFromTetra reply m_numberMessages= " << m_numberMessages << " messages.size()= " << messages.size();
|
||||
ExitSuccess();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
INFO_LOG(m_logger) << "Nothing to do in this TestCase";
|
||||
INFO_LOG() << "Nothing to do in this TestCase";
|
||||
}
|
||||
}
|
||||
} // checkMessageOnDdsAfterModify
|
||||
@@ -276,7 +275,7 @@ void MsgTests::checkMessageOnDdsAfterDelete()
|
||||
{
|
||||
// read from dds, check if data is as expected
|
||||
int isDeleted = 0;
|
||||
INFO_LOG(m_logger) << "checkMessageOnDdsAfterModify";
|
||||
INFO_LOG() << "checkMessageOnDdsAfterModify";
|
||||
m_dtc->waitForHistoricalDataOperatorMessage();
|
||||
const QMap<int, Messaging::OperatorMessage> messages = m_dtc->operatorMessages();
|
||||
for (const auto &om : messages)
|
||||
@@ -286,18 +285,18 @@ void MsgTests::checkMessageOnDdsAfterDelete()
|
||||
}
|
||||
if (isDeleted == 1)
|
||||
{
|
||||
INFO_LOG(m_logger) << "modify messages delete: Success ";
|
||||
INFO_LOG() << "modify messages delete: Success ";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
ERROR_LOG(m_logger) << "Error modify messages - got: " << isDeleted << " expected: 1";
|
||||
ERROR_LOG() << "Error modify messages - got: " << isDeleted << " expected: 1";
|
||||
failExit();
|
||||
} // checkMessageOnDdsAfterDelete
|
||||
|
||||
void MsgTests::markMessageAsRead()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to mark Message as read m_msgIdRecvMessage =" << m_msgIdRecvMessage;
|
||||
INFO_LOG() << "trying to mark Message as read m_msgIdRecvMessage =" << m_msgIdRecvMessage;
|
||||
|
||||
int32_t id = m_msgIdRecvMessage;
|
||||
bool isRead = true;
|
||||
@@ -306,14 +305,14 @@ void MsgTests::markMessageAsRead()
|
||||
|
||||
if (!m_ftc->modifyOperatorMessageRequest(ModifyOperatorMessageRequest(id, isRead, isSend, isDeleted), this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error mark Message as read";
|
||||
ERROR_LOG() << "Error mark Message as read";
|
||||
failExit();
|
||||
}
|
||||
} // markMessageAsRead
|
||||
|
||||
void MsgTests::markMessageAsDeleted()
|
||||
{
|
||||
INFO_LOG(m_logger) << "trying to mark Message as deleted m_msgIdRecvMessage =" << m_msgIdRecvMessage;
|
||||
INFO_LOG() << "trying to mark Message as deleted m_msgIdRecvMessage =" << m_msgIdRecvMessage;
|
||||
|
||||
int32_t id = m_msgIdRecvMessage;
|
||||
bool isRead = true;
|
||||
@@ -321,21 +320,21 @@ void MsgTests::markMessageAsDeleted()
|
||||
bool isDeleted = true;
|
||||
|
||||
m_dtc->waitForHistoricalDataOperatorMessage();
|
||||
DEBUG_LOG(m_logger) << "m_numberMessages =" << m_numberMessages;
|
||||
DEBUG_LOG() << "m_numberMessages =" << m_numberMessages;
|
||||
|
||||
if (!m_ftc->modifyOperatorMessageRequest(ModifyOperatorMessageRequest(id, isRead, isSend, isDeleted), this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error mark Message as deleted";
|
||||
ERROR_LOG() << "Error mark Message as deleted";
|
||||
failExit();
|
||||
}
|
||||
} // markMessageAsDeleted
|
||||
|
||||
void MsgTests::onCreateOperatorMessageReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onCreateOperatorMessageReply, error = " << replyObject.error();
|
||||
INFO_LOG() << "onCreateOperatorMessageReply, error = " << replyObject.error();
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error creating new message - aborting";
|
||||
ERROR_LOG() << "Error creating new message - aborting";
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
@@ -349,17 +348,17 @@ void MsgTests::onCreateOperatorMessageReply(const Core::FunctionReplyObject &rep
|
||||
QTimer::singleShot(1000, this, &MsgTests::checkMessageOnDdsAfterCreate);
|
||||
break;
|
||||
default:
|
||||
INFO_LOG(m_logger) << "Nothing to do in this Case";
|
||||
INFO_LOG() << "Nothing to do in this Case";
|
||||
}
|
||||
}
|
||||
} // onCreateOperatorMessageReply
|
||||
|
||||
void MsgTests::onModifyOperatorMessageReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onModifyOperatorMessageReply, error = " << replyObject.error();
|
||||
INFO_LOG() << "onModifyOperatorMessageReply, error = " << replyObject.error();
|
||||
if (replyObject.error())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error modify message - aborting";
|
||||
ERROR_LOG() << "Error modify message - aborting";
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
@@ -372,7 +371,7 @@ void MsgTests::onModifyOperatorMessageReply(const Core::FunctionReplyObject &rep
|
||||
/*
|
||||
void MsgTests::onSendEquipmentMessageReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
INFO_LOG(m_logger) << "************** onSendEquipmentMessageReply TODO isRead = TRUE setzen: id = **********************";
|
||||
INFO_LOG() << "************** onSendEquipmentMessageReply TODO isRead = TRUE setzen: id = **********************";
|
||||
}
|
||||
|
||||
*/
|
||||
@@ -384,7 +383,7 @@ void MsgTests::failExit()
|
||||
|
||||
void MsgTests::ExitSuccess()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "SUCCESS";
|
||||
DEBUG_LOG() << "SUCCESS";
|
||||
m_bTestsSuccessful = true;
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
} // ExitSuccess
|
||||
|
||||
@@ -71,9 +71,6 @@ private:
|
||||
int m_msgIdRecvMessage;
|
||||
int m_numberMessages;
|
||||
TestCase m_testStep;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
} // namespace Messaging
|
||||
@@ -15,9 +15,8 @@ namespace Messaging
|
||||
|
||||
DdsHandler::DdsHandler(int domainId)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::AllExercises))
|
||||
, m_logger(getLogger("DdsHandler"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
} // end of ctor()DdsHandler
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@@ -25,7 +24,7 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
{
|
||||
if (!m_ddsConnector->init(qosFileList))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
|
||||
ERROR_LOG() << "Error initializing dds connections - aborting";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -42,12 +41,12 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
// DTS
|
||||
m_ddsDts = Messaging::Interface::Dts::create(m_ddsConnector);
|
||||
bool bRet = m_ddsDts->enableAll();
|
||||
INFO_LOG(m_logger) << "Dts initialised";
|
||||
INFO_LOG() << "Dts initialised";
|
||||
|
||||
// FTS
|
||||
m_ddsFts = Messaging::Interface::Fts::create(m_ddsConnector);
|
||||
bRet &= m_ddsFts->enableAll();
|
||||
INFO_LOG(m_logger) << "Fts initialised";
|
||||
INFO_LOG() << "Fts initialised";
|
||||
|
||||
return bRet;
|
||||
} // end of init()
|
||||
|
||||
@@ -50,8 +50,6 @@ private:
|
||||
std::shared_ptr<Core::TopicLockMaster> m_topicLockMaster;
|
||||
std::shared_ptr<Messaging::Interface::Dts> m_ddsDts;
|
||||
std::shared_ptr<Messaging::Interface::Fts> m_ddsFts;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -16,7 +16,6 @@ ExerciseHandler::ExerciseHandler(const std::shared_ptr<DDSConnector::DdsConnecto
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(ddsConnector->getDomainId(), IDL::PartitionType::Exercise, exerciseId))
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_idleTimer(new QTimer(this))
|
||||
, m_logger(getLogger("ExerciseHandler"))
|
||||
{
|
||||
connect(m_idleTimer, &QTimer::timeout,
|
||||
this, &ExerciseHandler::exerciseHandlerIdleTimeout);
|
||||
@@ -27,7 +26,7 @@ ExerciseHandler::ExerciseHandler(const std::shared_ptr<DDSConnector::DdsConnecto
|
||||
bool ExerciseHandler::init()
|
||||
{
|
||||
m_ddsConnector->initPublisherSubscriber();
|
||||
DEBUG_LOG(m_logger) << "ExerciseHandler::init m_ddsConnector=" << m_ddsConnector
|
||||
DEBUG_LOG() << "ExerciseHandler::init m_ddsConnector=" << m_ddsConnector
|
||||
<< " m_exerciseId=" << m_exerciseId;
|
||||
m_tabFtc = TrainingAreaBase::Interface::Ftc::create(m_ddsConnector);
|
||||
bool retVal = m_tabFtc->enableSendEquipmentMessage();
|
||||
@@ -44,7 +43,7 @@ bool ExerciseHandler::sendEquipmentMessage(const TrainingAreaBase::SendEquipment
|
||||
{
|
||||
if (!m_tabFtc)
|
||||
return false;
|
||||
DEBUG_LOG(m_logger) << "ExerciseHandler::sendEquipmentMessage: " << request;
|
||||
DEBUG_LOG() << "ExerciseHandler::sendEquipmentMessage: " << request;
|
||||
m_idleTimer->stop();
|
||||
return m_tabFtc->sendEquipmentMessageRequest(request, this);
|
||||
}
|
||||
@@ -53,7 +52,7 @@ bool ExerciseHandler::sendOcEquipmentMessage(const OcSituationServer::SendEquipm
|
||||
{
|
||||
if (!m_ossFtc)
|
||||
return false;
|
||||
DEBUG_LOG(m_logger) << "ExerciseHandler::sendOcEquipmentMessage: "<< request;
|
||||
DEBUG_LOG() << "ExerciseHandler::sendOcEquipmentMessage: "<< request;
|
||||
m_idleTimer->stop();
|
||||
return m_ossFtc->sendEquipmentMessageOcRequest(request, this);
|
||||
}
|
||||
@@ -65,19 +64,19 @@ int ExerciseHandler::exerciseId() const
|
||||
|
||||
void ExerciseHandler::onSendEquipmentMessageReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
DEBUG_LOG(m_logger)<<"ExerciseHandler::onSendEquipmentMessageReply";
|
||||
DEBUG_LOG()<<"ExerciseHandler::onSendEquipmentMessageReply";
|
||||
m_idleTimer->start();
|
||||
if (replyObject.error())
|
||||
ERROR_LOG(m_logger) << replyObject();
|
||||
ERROR_LOG() << replyObject();
|
||||
emit equipmentMessageReply(replyObject.id(), !replyObject.error());
|
||||
}
|
||||
|
||||
void ExerciseHandler::onSendEquipmentMessageOcReply(const Core::FunctionReplyObject &replyObject)
|
||||
{
|
||||
DEBUG_LOG(m_logger)<<"ExerciseHandler::onSendEquipmentMessageOcReply";
|
||||
DEBUG_LOG()<<"ExerciseHandler::onSendEquipmentMessageOcReply";
|
||||
m_idleTimer->start();
|
||||
if (replyObject.error())
|
||||
ERROR_LOG(m_logger) << replyObject();
|
||||
ERROR_LOG() << replyObject();
|
||||
emit equipmentMessageOcReply(replyObject.id(), !replyObject.error());
|
||||
}
|
||||
} // namespace Messaging
|
||||
@@ -43,6 +43,5 @@ private:
|
||||
std::shared_ptr<OcSituationServer::Interface::Ftc> m_ossFtc;
|
||||
int m_exerciseId;
|
||||
QTimer *m_idleTimer; //<! timer to delete ExerciseHandler after n seconds when no longer needed
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
} // namespace Messaging
|
||||
@@ -19,7 +19,6 @@ namespace Messaging
|
||||
{
|
||||
ExercisesHandler::ExercisesHandler(const std::shared_ptr<DdsHandler> &ddsHandler)
|
||||
: m_ddsHandler(ddsHandler)
|
||||
, m_logger(getLogger("ExercisesHandler"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -37,7 +36,7 @@ bool ExercisesHandler::init()
|
||||
if (!m_ppmDtc->enableEquipmentExerciseMapping())
|
||||
return false;
|
||||
|
||||
ERROR_LOG(m_logger) << "# eem: " << m_ppmDtc->equipmentExerciseMappings().size();
|
||||
ERROR_LOG() << "# eem: " << m_ppmDtc->equipmentExerciseMappings().size();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -57,7 +56,7 @@ bool ExercisesHandler::sendEquipmentMessage(const TrainingAreaBase::SendEquipmen
|
||||
auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
|
||||
if (it == m_equipNo2ExerciseId.cend())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not send equipment message to training area - equipment number "
|
||||
ERROR_LOG() << "Can not send equipment message to training area - equipment number "
|
||||
<< equipmentNumber << " not known";
|
||||
return false;
|
||||
}
|
||||
@@ -73,7 +72,7 @@ bool ExercisesHandler::sendOcEquipmentMessage(const OcSituationServer::SendEquip
|
||||
auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
|
||||
if (it == m_equipNo2ExerciseId.cend())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Can not send equipment message to training area - equipment number "
|
||||
ERROR_LOG() << "Can not send equipment message to training area - equipment number "
|
||||
<< equipmentNumber << " not known";
|
||||
return false;
|
||||
}
|
||||
@@ -87,10 +86,10 @@ ExerciseHandler *ExercisesHandler::exerciseHandlerForExerciseId(int exerciseId)
|
||||
if (itEH != m_exerciseHandler.end())
|
||||
return itEH.value();
|
||||
|
||||
DEBUG_LOG(m_logger) << "new ExerciseHandler for id " << exerciseId;
|
||||
DEBUG_LOG() << "new ExerciseHandler for id " << exerciseId;
|
||||
auto exH = new ExerciseHandler(m_ddsHandler->ddsConnector(), exerciseId);
|
||||
bool result = exH->init();
|
||||
DEBUG_LOG(m_logger)<<"result init ="<<result;
|
||||
DEBUG_LOG()<<"result init ="<<result;
|
||||
connect(exH, &ExerciseHandler::exerciseHandlerIdleTimeout,
|
||||
this, &ExercisesHandler::onExerciseHandlerIdleTimeout);
|
||||
m_exerciseHandler[exerciseId] = exH;
|
||||
@@ -100,7 +99,7 @@ ExerciseHandler *ExercisesHandler::exerciseHandlerForExerciseId(int exerciseId)
|
||||
void ExercisesHandler::onEquipmentExerciseMappingChanged(const ParticipantManagement::EquipmentExerciseMapping &data,
|
||||
DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onEquipmentExerciseMappingChanged";
|
||||
DEBUG_LOG() << "onEquipmentExerciseMappingChanged";
|
||||
|
||||
for (auto it = m_equipNo2ExerciseId.begin(); it != m_equipNo2ExerciseId.end(); )
|
||||
{
|
||||
@@ -130,7 +129,7 @@ void ExercisesHandler::onEquipmentExerciseMappingChanged(const ParticipantManage
|
||||
|
||||
void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::EquipmentMessage &data, const DataModification modType)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onEquipmentMessageChanged";
|
||||
DEBUG_LOG() << "onEquipmentMessageChanged";
|
||||
if (modType != DataModification::eAdded &&
|
||||
modType != DataModification::eModified)
|
||||
return;
|
||||
@@ -138,7 +137,7 @@ void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::Equipme
|
||||
const auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
|
||||
if (it == m_equipNo2ExerciseId.constEnd())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Got EquipmentMessage from unknown participant with equipment number " << equipmentNumber;
|
||||
ERROR_LOG() << "Got EquipmentMessage from unknown participant with equipment number " << equipmentNumber;
|
||||
return;
|
||||
}
|
||||
emit messageFromTrainingArea(data);
|
||||
@@ -146,7 +145,7 @@ void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::Equipme
|
||||
|
||||
void ExercisesHandler::onExerciseHandlerIdleTimeout()
|
||||
{
|
||||
DEBUG_LOG(m_logger)<<"onExerciseHandlerIdleTimeout";
|
||||
DEBUG_LOG()<<"onExerciseHandlerIdleTimeout";
|
||||
ExerciseHandler *exH = qobject_cast<ExerciseHandler *>(sender());
|
||||
if (!exH)
|
||||
return;
|
||||
|
||||
@@ -48,6 +48,5 @@ private:
|
||||
// QHash< QPair<exerciseId,ParticipantId>, equipmentNumber>
|
||||
QHash<QPair<int,int>, int> m_participant2EquipNumber;
|
||||
QHash<int, int> m_equipNo2ExerciseId;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
} // namespace Messaging
|
||||
+24
-25
@@ -21,7 +21,6 @@ HandlerOperatorMessage::HandlerOperatorMessage(const std::shared_ptr<DdsHandler>
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_exercisesHandler(exercisesHandler)
|
||||
, m_logger(getLogger("HandlerOperatorMessage"))
|
||||
{
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -29,7 +28,7 @@ HandlerOperatorMessage::HandlerOperatorMessage(const std::shared_ptr<DdsHandler>
|
||||
//-----------------------------------------------------------------------------
|
||||
bool HandlerOperatorMessage::init()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Start HandlerOperatorMessage.";
|
||||
INFO_LOG() << "Start HandlerOperatorMessage.";
|
||||
|
||||
// read data from db-table 'msg_message_data'
|
||||
// add to internal buffer
|
||||
@@ -42,7 +41,7 @@ bool HandlerOperatorMessage::init()
|
||||
};
|
||||
if (!m_db->select(cbMsgData)) // TODO (CE): nicht alle selektieren, nur die, die nicht gelöscht sind
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error reading data from database 'msg_message_data'!";
|
||||
ERROR_LOG() << "Error reading data from database 'msg_message_data'!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -67,10 +66,10 @@ bool HandlerOperatorMessage::init()
|
||||
void HandlerOperatorMessage::onCreateOperatorMessageRequest(const rti::core::SampleIdentity &cookie,
|
||||
const CreateOperatorMessageRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onCreateOperatorMessageRequest" << request;
|
||||
DEBUG_LOG() << "onCreateOperatorMessageRequest" << request;
|
||||
auto ret = createOperatorMessageRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
m_ddsHandler->fts()->createOperatorMessageReply(cookie, ret);
|
||||
}
|
||||
|
||||
@@ -84,12 +83,12 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
|
||||
Database::MsgMessageData newMsg;
|
||||
newMsg.timeStamp = m_ddsHandler->currentPartitionTime();
|
||||
newMsg.senderId = request.senderId();
|
||||
INFO_LOG(m_logger) << "newMsg.senderId=" << newMsg.senderId;
|
||||
INFO_LOG() << "newMsg.senderId=" << newMsg.senderId;
|
||||
newMsg.subject = QString::fromStdString(request.subject());
|
||||
newMsg.message = QString::fromStdString(request.message());
|
||||
newMsg.senderType = request.senderType();
|
||||
|
||||
INFO_LOG(m_logger) << "newMsg.senderType.underlying()=" << newMsg.senderType.underlying();
|
||||
INFO_LOG() << "newMsg.senderType.underlying()=" << newMsg.senderType.underlying();
|
||||
newMsg.senderText = toAddressStr(newMsg.senderType, newMsg.senderId, request.exerciseId());
|
||||
newMsg.recipientType = request.recipientType();
|
||||
newMsg.exerciseId = request.exerciseId();
|
||||
@@ -103,7 +102,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
|
||||
newMsg.isRead = false;
|
||||
newMsg.isDeleted = false;
|
||||
|
||||
INFO_LOG(m_logger) << "newMsg.senderType=" << newMsg.senderType << " newMsg.receiverType=" << newMsg.recipientType;
|
||||
INFO_LOG() << "newMsg.senderType=" << newMsg.senderType << " newMsg.receiverType=" << newMsg.recipientType;
|
||||
// Insert message for sender
|
||||
newMsg.recipientId = 0;
|
||||
newMsg.recipientText = recipientText;
|
||||
@@ -116,7 +115,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
|
||||
|
||||
if (!ret.error() )
|
||||
{
|
||||
INFO_LOG(m_logger) << "insert message for each receiver";
|
||||
INFO_LOG() << "insert message for each receiver";
|
||||
// Insert message for each receiver
|
||||
//newMsg.senderId = 0; WHY?
|
||||
//if (correspondingOutboxMsgId > 0) // messages received from TETRA dont have a corresponding outbox id
|
||||
@@ -126,14 +125,14 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c
|
||||
{
|
||||
newMsg.recipientId = recipientId;
|
||||
newMsg.recipientText = toAddressStr(newMsg.recipientType, newMsg.recipientId, newMsg.exerciseId);
|
||||
INFO_LOG(m_logger) << "recipientId: " << newMsg.recipientId;
|
||||
INFO_LOG() << "recipientId: " << newMsg.recipientId;
|
||||
ret = insertInDbAndPublish(newMsg);
|
||||
if (ret.error())
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
WARNING_LOG() << ret();
|
||||
|
||||
return ret;
|
||||
|
||||
@@ -202,7 +201,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
|
||||
newMsg.subject = newMsg.subject.left(m_maxSubjectLength);
|
||||
newMsg.message.clear();
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "newMsg.senderId = " << newMsg.senderId;
|
||||
DEBUG_LOG() << "newMsg.senderId = " << newMsg.senderId;
|
||||
if (!m_db->insert(newMsg))
|
||||
return Core::FunctionReplyObject(0, tr_lts("dds", "Error adding message to database"));
|
||||
|
||||
@@ -215,20 +214,20 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
|
||||
int32_t equipmentNumber = m_exercisesHandler->findEquipmentNumber(newMsg.recipientId, newMsg.exerciseId);
|
||||
int32_t participantId = newMsg.recipientId;
|
||||
|
||||
INFO_LOG(m_logger) << "equipmentNumber: " << equipmentNumber << ", participantId: " << participantId << ", exerciseId: " << newMsg.exerciseId;
|
||||
INFO_LOG() << "equipmentNumber: " << equipmentNumber << ", participantId: " << participantId << ", exerciseId: " << newMsg.exerciseId;
|
||||
|
||||
// Length Check:
|
||||
const auto subject = newMsg.subject.toStdString();
|
||||
const auto message = newMsg.message.toStdString();
|
||||
INFO_LOG(m_logger) << "Message to OC: subject =" << subject << " Message =" << message;
|
||||
INFO_LOG() << "Message to OC: subject =" << subject << " Message =" << message;
|
||||
|
||||
// only send to Tetra:
|
||||
if (newMsg.recipientId > 0)
|
||||
{
|
||||
int senderId = m_dbOperatorMessageData[newMsg.correspondingOutboxMessageId].senderId;
|
||||
AddressType senderType = m_dbOperatorMessageData[newMsg.correspondingOutboxMessageId].senderType;
|
||||
INFO_LOG(m_logger) << "SendEquipmentMessageRequest id =" << newMsg.id;
|
||||
INFO_LOG(m_logger) << " equipmentNumber=" << equipmentNumber
|
||||
INFO_LOG() << "SendEquipmentMessageRequest id =" << newMsg.id;
|
||||
INFO_LOG() << " equipmentNumber=" << equipmentNumber
|
||||
<< " participantId=" << participantId
|
||||
<< " newMsg.id=" << newMsg.id
|
||||
<< " newMsg.senderId=" << senderId
|
||||
@@ -238,7 +237,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
|
||||
static int s_requestId = 1;
|
||||
if (newMsg.recipientType == Messaging::AddressType_def::type::ObserverController)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Send to OC senderId=" << newMsg.senderId << " sendertype: " << newMsg.senderType << " subject " << subject;
|
||||
INFO_LOG() << "Send to OC senderId=" << newMsg.senderId << " sendertype: " << newMsg.senderType << " subject " << subject;
|
||||
m_exercisesHandler->sendOcEquipmentMessage({s_requestId++,
|
||||
{equipmentNumber},
|
||||
//newMsg.id,
|
||||
@@ -266,10 +265,10 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
|
||||
|
||||
m_ddsHandler->dts()->publish(toDdsData(newMsg));
|
||||
|
||||
INFO_LOG(m_logger) << "insertInDbAndPublish id=" << newMsg.id;
|
||||
INFO_LOG() << "insertInDbAndPublish id=" << newMsg.id;
|
||||
if (newMsg.recipientType == Messaging::AddressType_def::type::ObserverController && newMsg.recipientId > 0)
|
||||
{
|
||||
INFO_LOG(m_logger) << "O/C-Message in Member-Variable kopieren: id = " << newMsg.id;
|
||||
INFO_LOG() << "O/C-Message in Member-Variable kopieren: id = " << newMsg.id;
|
||||
}
|
||||
|
||||
return Core::FunctionReplyObject(newMsg.id);
|
||||
@@ -279,7 +278,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database:
|
||||
// Modify db and publish
|
||||
Core::FunctionReplyObject HandlerOperatorMessage::modifyDbAndPublish(const Database::MsgMessageData &modMsg)
|
||||
{
|
||||
INFO_LOG(m_logger) << "modifyDbAndPublish" << " id=" << modMsg.id <<
|
||||
INFO_LOG() << "modifyDbAndPublish" << " id=" << modMsg.id <<
|
||||
" isDeleted=" << modMsg.isDeleted <<
|
||||
" modMsg.isRead=" << modMsg.isRead <<
|
||||
" modMsg.isSend=" << modMsg.isSend <<
|
||||
@@ -292,7 +291,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::modifyDbAndPublish(const Datab
|
||||
m_dbOperatorMessageData[modMsg.id] = modMsg;
|
||||
if (modMsg.isDeleted)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Remove LTS_OperatorMessage from DDS id=" << modMsg.id;
|
||||
INFO_LOG() << "Remove LTS_OperatorMessage from DDS id=" << modMsg.id;
|
||||
m_ddsHandler->dts()->removeOperatorMessageByKey(modMsg.id);
|
||||
}
|
||||
else
|
||||
@@ -304,7 +303,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::modifyDbAndPublish(const Datab
|
||||
// Receive from Tetra
|
||||
void HandlerOperatorMessage::onMesssageFromTrainingArea(const TrainingAreaBase::EquipmentMessage &data)
|
||||
{
|
||||
INFO_LOG(m_logger) << "************ onMesssageFromTrainingArea ********************";
|
||||
INFO_LOG() << "************ onMesssageFromTrainingArea ********************";
|
||||
onEquipmentMessageChanged(data, DataModification::eAdded);
|
||||
}
|
||||
|
||||
@@ -315,11 +314,11 @@ void HandlerOperatorMessage::onEquipmentMessageChanged(const TrainingAreaBase::E
|
||||
return;
|
||||
|
||||
CreateOperatorMessageRequest request;
|
||||
DEBUG_LOG(m_logger) << "onEquipmentMessageChanged: " << data;
|
||||
DEBUG_LOG() << "onEquipmentMessageChanged: " << data;
|
||||
|
||||
request.senderType() = Messaging::AddressType_def::type::Participant;
|
||||
request.senderId(data.sender());
|
||||
DEBUG_LOG(m_logger) << "request.senderId = " << request.senderId();
|
||||
DEBUG_LOG() << "request.senderId = " << request.senderId();
|
||||
request.recipientType(Messaging::AddressType_def::type::Operator);
|
||||
request.recipientIds().push_back(data.receiver());
|
||||
request.subject() = data.subject();
|
||||
@@ -331,7 +330,7 @@ void HandlerOperatorMessage::onEquipmentMessageChanged(const TrainingAreaBase::E
|
||||
|
||||
void HandlerOperatorMessage::onOperatorChanged(const OperatorManagement::User &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "************** onOperatorChanged ";
|
||||
DEBUG_LOG() << "************** onOperatorChanged ";
|
||||
m_operatorMap.insert(data.id(), data.name());
|
||||
} // end of onOperatorChanged
|
||||
|
||||
|
||||
@@ -64,8 +64,6 @@ private: // attributes
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_opmDtc;
|
||||
//std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
QMap<int, std::string> m_operatorMap;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
static const unsigned int m_maxSubjectLength = 80;
|
||||
static const unsigned int m_maxOcContentLength = 1024;
|
||||
};
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include "msg_export.h"
|
||||
#include "svcmsgcommon_export.h"
|
||||
|
||||
namespace Messaging
|
||||
{
|
||||
|
||||
@@ -18,13 +18,13 @@ namespace Messaging
|
||||
MainHandler::MainHandler()
|
||||
: m_logger(getLogger("MainHandler"))
|
||||
{
|
||||
INFO_LOG(m_logger) << "MainHandler::MainHandler";
|
||||
INFO_LOG() << "MainHandler::MainHandler";
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
INFO_LOG(m_logger) << "MainHandler::~MainHandler";
|
||||
INFO_LOG() << "MainHandler::~MainHandler";
|
||||
m_handlerOperatorMessage = nullptr;
|
||||
m_exercisesHandler = nullptr;
|
||||
m_ddsHandler = nullptr;
|
||||
@@ -34,53 +34,53 @@ MainHandler::~MainHandler()
|
||||
|
||||
bool MainHandler::init(int domainId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Start MessageDataManagement MainHandler. domainId ="<<domainId;
|
||||
INFO_LOG() << "Start MessageDataManagement MainHandler. domainId ="<<domainId;
|
||||
|
||||
// initialize DDS
|
||||
m_ddsHandler = std::make_shared<DdsHandler>(domainId);
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation DdsHandler failed.";
|
||||
ERROR_LOG() << "Initialisation DdsHandler failed.";
|
||||
if (m_ddsHandler->pacemaker())
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
INFO_LOG(m_logger) << "m_ddsHandler initialized. ";
|
||||
INFO_LOG() << "m_ddsHandler initialized. ";
|
||||
|
||||
// initialize database
|
||||
m_dbHandler = std::make_shared<DbHandler>();
|
||||
if (!m_dbHandler->init(0, Settings::settings()))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation DbHandler failed.";
|
||||
ERROR_LOG() << "Initialisation DbHandler failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
INFO_LOG(m_logger) << "DbHandler initialized. ";
|
||||
INFO_LOG() << "DbHandler initialized. ";
|
||||
|
||||
|
||||
INFO_LOG(m_logger) << "create HandlerExercises. ";
|
||||
INFO_LOG() << "create HandlerExercises. ";
|
||||
m_exercisesHandler = std::make_shared<ExercisesHandler>(m_ddsHandler);
|
||||
if (!m_exercisesHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "create HandlerExercise failed.";
|
||||
ERROR_LOG() << "create HandlerExercise failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
INFO_LOG(m_logger) << "m_exercisesHandler="<<m_exercisesHandler;
|
||||
INFO_LOG() << "m_exercisesHandler="<<m_exercisesHandler;
|
||||
|
||||
|
||||
|
||||
// create HandlerCreate
|
||||
INFO_LOG(m_logger) << "create HandlerCreate. ";
|
||||
INFO_LOG() << "create HandlerCreate. ";
|
||||
m_handlerOperatorMessage = std::make_shared<HandlerOperatorMessage>(m_ddsHandler, m_dbHandler->db(), m_exercisesHandler);
|
||||
if (!m_handlerOperatorMessage->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "create HandlerMarkAsDelete failed.";
|
||||
ERROR_LOG() << "create HandlerMarkAsDelete failed.";
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
|
||||
return false;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "HandlerCreate initialized. ";
|
||||
INFO_LOG() << "HandlerCreate initialized. ";
|
||||
|
||||
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
|
||||
//m_ddsHandler->enableEquipmentMessage();
|
||||
|
||||
@@ -37,7 +37,7 @@ private: // attributes
|
||||
std::shared_ptr<DbHandler> m_dbHandler; ///< Pointer to DB handler
|
||||
std::shared_ptr<ExercisesHandler> m_exercisesHandler; ///<Messages from OC
|
||||
std::shared_ptr<HandlerOperatorMessage> m_handlerOperatorMessage; ///< Messages between Operators / O/C
|
||||
NGL::INGLLogger &m_logger; ///< Interface to the Logging-Facility
|
||||
|
||||
|
||||
};
|
||||
} // namespace MessagingDataManagement
|
||||
Reference in new issue
Block a user