Adds immediate migration results in progress

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

No files matched your search

@@ -42,7 +42,7 @@ OpmTests::~OpmTests()
//-----------------------------------------------------------------------------
bool OpmTests::init(int domainId, int exerciseId, int testId, int operatorId, int createdId)
{
INFO_LOG() << "OpmTests::init() "
INFO_LOG(m_logger) << "OpmTests::init() "
<< " domainId:" << domainId
<< " exerciseId:" << exerciseId
<< " testId: " << testId
@@ -61,18 +61,18 @@ bool OpmTests::init(int domainId, int exerciseId, int testId, int operatorId, in
m_ddsConnector->initPublisherSubscriber();
// Access to FTC
DEBUG_LOG() << "create ftc";
DEBUG_LOG(m_logger) << "create ftc";
m_ftc = OperatorManagement::Interface::Ftc::create(m_ddsConnector);
DEBUG_LOG() << "init ftc";
DEBUG_LOG(m_logger) << "init ftc";
bool bRet = m_ftc->enableAll();
DEBUG_LOG() << "init end - bRet = " << bRet;
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
// Access to DTC
DEBUG_LOG() << "create dtc";
DEBUG_LOG(m_logger) << "create dtc";
m_dtc = OperatorManagement::Interface::Dtc::create(m_ddsConnector);
DEBUG_LOG() << "init dtc";
DEBUG_LOG(m_logger) << "init dtc";
bRet = m_dtc->enableAll();
DEBUG_LOG() << "init end - bRet = " << bRet;
DEBUG_LOG(m_logger) << "init end - bRet = " << bRet;
connect(m_dtc.get(), &Interface::Dtc::userChanged,
this, &OpmTests::onReceiveOperatorChanged);
@@ -86,7 +86,7 @@ bool OpmTests::init(int domainId, int exerciseId, int testId, int operatorId, in
//-----------------------------------------------------------------------------
void OpmTests::startTest()
{
INFO_LOG() << "startTest() exerciseId:" << m_exerciseId
INFO_LOG(m_logger) << "startTest() exerciseId:" << m_exerciseId
<< " testId:" << m_testId
<< " operatorId:" << m_operatorId
;
@@ -121,10 +121,10 @@ void OpmTests::tryCreate()
OperatorCreateModifyRequest data;
getOperatorCreateRequestData( data);
INFO_LOG() << "trying to send OperatorCreateRequest";
INFO_LOG(m_logger) << "trying to send OperatorCreateRequest";
if (!m_ftc->operatorCreateModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting create data";
ERROR_LOG(m_logger) << "Error requesting create data";
failExit();
}
QTest::qWait(1000);
@@ -137,10 +137,10 @@ void OpmTests::tryModify()
OperatorCreateModifyRequest data;
getOperatorModifyRequestData(data);
INFO_LOG() << "trying to send OperatorCreateModifyRequest";
INFO_LOG(m_logger) << "trying to send OperatorCreateModifyRequest";
if (!m_ftc->operatorCreateModifyRequest(data, this))
{
ERROR_LOG() << "Error requesting modify data";
ERROR_LOG(m_logger) << "Error requesting modify data";
failExit();
}
QTest::qWait(1000);
@@ -154,10 +154,10 @@ void OpmTests::tryRemove()
data.id(m_operatorId);
INFO_LOG() << "trying to send remove request";
INFO_LOG(m_logger) << "trying to send remove request";
if (!m_ftc->operatorRemoveRequest(data, this))
{
ERROR_LOG() << "Error requesting remove data";
ERROR_LOG(m_logger) << "Error requesting remove data";
failExit();
}
QTest::qWait(1000);
@@ -190,7 +190,7 @@ void OpmTests::tryLogin()
<< ", force:" << data.force();
if (!m_ftc->operatorLoginRequest(data, this))
{
ERROR_LOG() << "Error login operator id " << m_operatorId << " on workstation 1";
ERROR_LOG(m_logger) << "Error login operator id " << m_operatorId << " on workstation 1";
failExit();
}
QTest::qWait(1000);
@@ -213,10 +213,10 @@ void OpmTests::tryLoginForce()
data.workstationId(4);
data.force(true);
INFO_LOG() << "trying to send OperatorLoginRequest";
INFO_LOG(m_logger) << "trying to send OperatorLoginRequest";
if (!m_ftc->operatorLoginRequest(data, this))
{
ERROR_LOG() << "Error login operator id " << m_operatorId << " on workstation 1";
ERROR_LOG(m_logger) << "Error login operator id " << m_operatorId << " on workstation 1";
failExit();
}
QTest::qWait(1000);
@@ -230,10 +230,10 @@ void OpmTests::tryLogout()
data.id(m_operatorId);
INFO_LOG() << "trying to send OperatorLogoutRequest";
INFO_LOG(m_logger) << "trying to send OperatorLogoutRequest";
if (!m_ftc->operatorLogoutRequest(data, this))
{
ERROR_LOG() << "Error logout operator id " << m_operatorId;
ERROR_LOG(m_logger) << "Error logout operator id " << m_operatorId;
failExit();
}
QTest::qWait(1000);
@@ -246,18 +246,18 @@ void OpmTests::tryGetOperatorsByOperatorRight()
int operatorRight = OperatorRights::CContaminationsEdit;
m_dtc->waitForHistoricalDataUser();
INFO_LOG() << "trying to send get operators by operatorRight";
INFO_LOG(m_logger) << "trying to send get operators by operatorRight";
QVector<int> operators = m_dtc->getOperatorsByOperatorRight(operatorRight);
if (operators.empty())
{
ERROR_LOG() << "Error no operators for operatorRight: " << operatorRight;
ERROR_LOG(m_logger) << "Error no operators for operatorRight: " << operatorRight;
failExit();
}
else
{
for (int operatorId : operators)
{
INFO_LOG() << "Operator " << operatorId << " found.";
INFO_LOG(m_logger) << "Operator " << operatorId << " found.";
}
}
QTest::qWait(1000);
@@ -266,22 +266,22 @@ void OpmTests::tryGetOperatorsByOperatorRight()
void OpmTests::tryGetAllOperators()
{
m_eTestStep = eGetAllOperators;
DEBUG_LOG() << "trying to get all operators";
DEBUG_LOG(m_logger) << "trying to get all operators";
m_dtc->waitForHistoricalDataUser();
const QMap<qint32, OperatorManagement::User> opMap = m_dtc->users();
if(opMap.isEmpty())
{
ERROR_LOG() << "Error requesting all operator data";
ERROR_LOG(m_logger) << "Error requesting all operator data";
failExit();
}
else
{
INFO_LOG() << "Amout of existing operators = " << opMap.size();
INFO_LOG(m_logger) << "Amout of existing operators = " << opMap.size();
m_operatorId = opMap.firstKey();
for(auto it = opMap.begin(); it != opMap.end(); ++it)
{
INFO_LOG() << "opm(" << it.key() << ") :"
INFO_LOG(m_logger) << "opm(" << it.key() << ") :"
<< " name:" << it.value().name()
// << " password:" << it.value().password()
// << " effectiveACLs:" << it.value().effectiveAcls()
@@ -294,7 +294,7 @@ void OpmTests::tryGetAllOperators()
//-----------------------------------------------------------------------------
void OpmTests::tryGetOperator()
{
DEBUG_LOG() << "trying to get operator with id:" << m_operatorId;
DEBUG_LOG(m_logger) << "trying to get operator with id:" << m_operatorId;
if(m_testId > 1)
{
@@ -303,7 +303,7 @@ void OpmTests::tryGetOperator()
if(m_operatorId <= 0)
{
ERROR_LOG() << "invalid operatorId - test aborted.";
ERROR_LOG(m_logger) << "invalid operatorId - test aborted.";
failExit();
}
@@ -312,12 +312,12 @@ void OpmTests::tryGetOperator()
if(op.id() <= 0)
{
ERROR_LOG() << "Error receiving data for operatorId " << m_operatorId << " returnVal:" << op.id();
ERROR_LOG(m_logger) << "Error receiving data for operatorId " << m_operatorId << " returnVal:" << op.id();
failExit();
}
else
{
INFO_LOG() << "opm(" << op.id() << ") :"
INFO_LOG(m_logger) << "opm(" << op.id() << ") :"
<< " name: " << op.name()
// << " password: " << data.password()
// << " effectiveACLs:" << it.value().effectiveAcls()
@@ -330,7 +330,7 @@ void OpmTests::tryGetOperator()
{
if(! onCompareCreatedData(op))
{
ERROR_LOG() << "Compare created data failed!";
ERROR_LOG(m_logger) << "Compare created data failed!";
failExit();
}
else
@@ -343,7 +343,7 @@ void OpmTests::tryGetOperator()
{
if(! onCompareModifiedData(op))
{
ERROR_LOG() << "Compare modified data failed!";
ERROR_LOG(m_logger) << "Compare modified data failed!";
failExit();
}
else
@@ -363,20 +363,20 @@ void OpmTests::tryGetOperator()
//-----------------------------------------------------------------------------
void OpmTests::onOperatorCreateModifyReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got create/modifyReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got create/modifyReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
m_operatorId = replyObject.id();
if(replyObject.error())
{
ERROR_LOG() << "Error requesting create/modify data";
ERROR_LOG(m_logger) << "Error requesting create/modify data";
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting create/modify data ok. Got id:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting create/modify data ok. Got id:" << replyObject.id() << " ... ok.";
}
if(m_testId == 0)
@@ -394,23 +394,23 @@ void OpmTests::onOperatorCreateModifyReply(const Core::FunctionReplyObject &repl
//-----------------------------------------------------------------------------
void OpmTests::onOperatorRemoveReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got removeReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got removeReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if(replyObject.error())
{
ERROR_LOG() << "Error requesting remove data for id:" << replyObject.id();
ERROR_LOG(m_logger) << "Error requesting remove data for id:" << replyObject.id();
failExit();
return;
}
else
{
DEBUG_LOG() << "Requesting remove data for id:" << replyObject.id() << " ... ok.";
DEBUG_LOG(m_logger) << "Requesting remove data for id:" << replyObject.id() << " ... ok.";
}
if(m_testId == 0)
{
INFO_LOG() << "***** FTC/DTC test successfully finished. (used id:" << replyObject.id() << ") *****";
INFO_LOG(m_logger) << "***** FTC/DTC test successfully finished. (used id:" << replyObject.id() << ") *****";
// ansonsten verheriger Ausstieg mit Errorlog.
}
@@ -421,12 +421,12 @@ void OpmTests::onOperatorRemoveReply(const Core::FunctionReplyObject &replyObjec
//-----------------------------------------------------------------------------
void OpmTests::onOperatorLoginReply(const Core::FunctionReplyObject &replyObject)
{
DEBUG_LOG() << "Got loginReply with id " << replyObject.id()
DEBUG_LOG(m_logger) << "Got loginReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if(replyObject.error())
{
ERROR_LOG() << "Error requesting login for id:" << replyObject.id();
ERROR_LOG(m_logger) << "Error requesting login for id:" << replyObject.id();
failExit();
return;
}
@@ -437,12 +437,12 @@ void OpmTests::onOperatorLoginReply(const Core::FunctionReplyObject &replyObject
//-----------------------------------------------------------------------------
void OpmTests::onOperatorLogoutReply(const Core::FunctionReplyObject &replyObject)
{
INFO_LOG() << "Got logoutReply with id " << replyObject.id()
INFO_LOG(m_logger) << "Got logoutReply with id " << replyObject.id()
<< " and errorString " << replyObject.translated();
if(replyObject.error())
{
ERROR_LOG() << "Error requesting logout for id:" << replyObject.id();
ERROR_LOG(m_logger) << "Error requesting logout for id:" << replyObject.id();
failExit();
return;
}
@@ -456,8 +456,8 @@ void OpmTests::onReceiveOperatorChanged(const User &data, DataModification modTy
// Check signal/slot connection
if (m_operatorId == data.id())
{
TRACE_LOG() << "Check signal/slot connection for DTC. Data for id = " << data.id() << " received";
TRACE_LOG() << "ModificationType: = " << (int)modType << " received";
TRACE_LOG(m_logger) << "Check signal/slot connection for DTC. Data for id = " << data.id() << " received";
TRACE_LOG(m_logger) << "ModificationType: = " << (int)modType << " received";
}
} // end of onReceiveOperatorData()
@@ -467,8 +467,8 @@ void OpmTests::onReceiveGroupChanged(const Group &data, DataModification modType
// Check signal/slot connection
// if (m_operatorId == data.id())
// {
TRACE_LOG() << "Check signal/slot connection for DTC. Data for id = " << data.id() << " received";
TRACE_LOG() << "ModificationType: = " << (int)modType << " received";
TRACE_LOG(m_logger) << "Check signal/slot connection for DTC. Data for id = " << data.id() << " received";
TRACE_LOG(m_logger) << "ModificationType: = " << (int)modType << " received";
// }
} // end of onReceiveOperatorData()
@@ -513,7 +513,7 @@ void OpmTests::getOperatorModifyRequestData(OperatorCreateModifyRequest &data) c
//-----------------------------------------------------------------------------
bool OpmTests::onCompareCreatedData(User &data)
{
DEBUG_LOG() << "start onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
OperatorCreateModifyRequest createData;
@@ -528,7 +528,7 @@ bool OpmTests::onCompareCreatedData(User &data)
if (data.description() != createData.description())
return false;
DEBUG_LOG() << "successfull finished onCompareCreatedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
return true;
} // end of onCompareCreatedData()
@@ -536,7 +536,7 @@ bool OpmTests::onCompareCreatedData(User &data)
//-----------------------------------------------------------------------------
bool OpmTests::onCompareModifiedData(User &data)
{
DEBUG_LOG() << "start onCompareModifiedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
OperatorCreateModifyRequest modifyData;
@@ -551,7 +551,7 @@ bool OpmTests::onCompareModifiedData(User &data)
if (data.description() != modifyData.description())
return false;
DEBUG_LOG() << "successfully finished onCompareModifiedData() for id :" << data.id();
DEBUG_LOG(m_logger) << "successfully finished onCompareModifiedData() for id :" << data.id();
return true;
} // end of onCompareModifiedData()
@@ -67,6 +67,7 @@ protected Q_SLOTS:
void onReceiveGroupChanged(const Group &data, DataModification modType);
protected:
NGL::INGLLogger &m_logger;
// Callbackfunctions for FTC
void onOperatorCreateModifyReply(const Core::FunctionReplyObject &replyObject) override final;
void onOperatorRemoveReply(const Core::FunctionReplyObject &replyObject) override final;
@@ -51,9 +51,8 @@ ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandle
// ####### ClientMessage end #######
// ####### BaseDlRequest begin #######
BaseDlRequest::BaseDlRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid)
: ClientMessage(dataManager, client, type, typeId, uuid)
{}
BaseDlRequest::BaseDlRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid) : ClientMessage(dataManager, client, type, typeId, uuid),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
void BaseDlRequest::process()
{
@@ -36,7 +36,7 @@ bool WebSocketInterfaceHandler::init()
{
cleanup();
DEBUG_LOG() << "... ok";
DEBUG_LOG(m_logger) << "... ok";
m_dataManager = new DataManager(m_mainHandler);
@@ -44,16 +44,16 @@ bool WebSocketInterfaceHandler::init()
m_webSocketServer = new LtsWebSocket::LtsWebSocketServer(m_messageFactory, this);
DEBUG_LOG() << "Initialising LtsWebSocketServer";
DEBUG_LOG(m_logger) << "Initialising LtsWebSocketServer";
if (!m_webSocketServer->init(QStringLiteral("ASM"), Settings::getWebSocketServerPortRange(1)))
{
ERROR_LOG() << "Failed to initialise LtsWebSocketServer";
ERROR_LOG(m_logger) << "Failed to initialise LtsWebSocketServer";
return false;
}
DEBUG_LOG() << "... ok";
DEBUG_LOG(m_logger) << "... ok";
DEBUG_LOG() << "Connection signals and slots";
DEBUG_LOG() << "... ok";
DEBUG_LOG(m_logger) << "Connection signals and slots";
DEBUG_LOG(m_logger) << "... ok";
return true;
}
@@ -16,14 +16,14 @@ namespace OperatorManagement
DdsHandler::DdsHandler(int domainId)
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any, 0))
{
DEBUG_LOG() << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
bool DdsHandler::init(const QStringList &qosFileList)
{
if(!m_ddsConnector->init(qosFileList))
{
ERROR_LOG() << "Error initializing dds connections - aborting";
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
return false;
}
@@ -46,10 +46,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
!m_ddsDts->enableActiveApp() ||
!m_dtcAsm->enableAsset())
bRet = false;
INFO_LOG() << "Dts initialised: " << bRet;;
INFO_LOG(m_logger) << "Dts initialised: " << bRet;;
bRet &= m_ddsFts->enableAll();
INFO_LOG() << "Fts initialised" << bRet;
INFO_LOG(m_logger) << "Fts initialised" << bRet;
return bRet;
}
@@ -41,6 +41,7 @@ public:
std::shared_ptr<DDSConnector::DdsConnector> ddsConnector() const { return m_ddsConnector; }
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
std::shared_ptr<Core::Pacemaker> m_pacemaker;
std::shared_ptr<Core::TopicLockMaster> m_topicLockMaster;
@@ -33,7 +33,7 @@ bool HandlerAccessControlLevel::init()
if(ret.error())
{
delete ifs;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
bRet = false;
return;
}
@@ -42,11 +42,11 @@ bool HandlerAccessControlLevel::init()
if (!m_mainHandler->db()->select(cb) || !bRet)
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
DEBUG_LOG() << "m_exeObjMap.size() = " << m_accesscontrollevelObjMap.size();
DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_accesscontrollevelObjMap.size();
return true;
}
@@ -25,6 +25,7 @@ public:
bool init();
private:
NGL::INGLLogger &m_logger;
QMap<int, ObjectAccessControlLevel*> m_accesscontrollevelObjMap;
MainHandler *m_mainHandler;
};
@@ -43,7 +43,7 @@ bool HandlerActiveApps::init()
void HandlerActiveApps::cleanupOperator(int operatorId)
{
INFO_LOG() << "cleanupOperator operatorId: " << operatorId
INFO_LOG(m_logger) << "cleanupOperator operatorId: " << operatorId
<< ", m_activeApps.size = " << m_activeApps.size();
// Operator has logged in or out or WS is not alive anymore:
@@ -55,7 +55,7 @@ void HandlerActiveApps::cleanupOperator(int operatorId)
const ActiveApp &item = it.value();
if (item.operatorId() == operatorId)
{
INFO_LOG() << "cleanupOperator operatorId: " << operatorId << " ActiveApp=" << item;
INFO_LOG(m_logger) << "cleanupOperator operatorId: " << operatorId << " ActiveApp=" << item;
dtsPtr->removeActiveAppByKey(item.id());
it = m_activeApps.erase(it);
}
@@ -92,11 +92,11 @@ void HandlerActiveApps::removeZombieEntry(const ActiveApp &request)
void HandlerActiveApps::onActiveAppUpdateRequest(const rti::core::SampleIdentity &cookie,
const ActiveApp &request)
{
DEBUG_LOG() << "onActiveAppUpdateRequest: " << request;
DEBUG_LOG(m_logger) << "onActiveAppUpdateRequest: " << request;
auto ret = activeAppUpdateRequest(request);
if (ret.error())
WARNING_LOG() << ret();
DEBUG_LOG() << "onActiveAppUpdateRequest - returned id: " << ret.id();
WARNING_LOG(m_logger) << ret();
DEBUG_LOG(m_logger) << "onActiveAppUpdateRequest - returned id: " << ret.id();
fts()->activeAppUpdateReply(cookie, ret);
}
@@ -135,7 +135,7 @@ Core::FunctionReplyObject HandlerActiveApps::activeAppUpdateRequest(const Active
// copy data
it.value() = request;
}
DEBUG_LOG() << "onActiveAppUpdateRequest - publish new data: " << it.value();
DEBUG_LOG(m_logger) << "onActiveAppUpdateRequest - publish new data: " << it.value();
dts()->publish(it.value());
return Core::FunctionReplyObject(it.value().id());
}
@@ -143,10 +143,10 @@ Core::FunctionReplyObject HandlerActiveApps::activeAppUpdateRequest(const Active
void HandlerActiveApps::onActiveAppRemoveRequest(const rti::core::SampleIdentity &cookie,
const Core::RemoveElementRequest &request)
{
DEBUG_LOG() << "onActiveAppRemoveRequest: " << request;
DEBUG_LOG(m_logger) << "onActiveAppRemoveRequest: " << request;
auto ret = activeAppRemoveRequest(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
fts()->activeAppRemoveReply(cookie, ret);
}
@@ -31,6 +31,7 @@ public:
void cleanupOperator(int operatorId);
private:
NGL::INGLLogger &m_logger;
void cleanup();
void removeZombieEntry(const ActiveApp &request);
void onActiveAppUpdateRequest(const rti::core::SampleIdentity &cookie,
@@ -44,6 +45,7 @@ private:
std::shared_ptr<Interface::Fts> fts() const;
private:
NGL::INGLLogger &m_logger;
QHash<int /*id*/, ActiveApp> m_activeApps;
MainHandler *m_mainHandler;
};
@@ -53,7 +53,7 @@ bool HandlerGroup::init()
};
if (!m_mainHandler->db()->select(cbGroupGroup))
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return true;
}
@@ -64,7 +64,7 @@ bool HandlerGroup::init()
};
if (!m_mainHandler->db()->select(cbAclAllow))
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return true;
}
@@ -75,7 +75,7 @@ bool HandlerGroup::init()
};
if (!m_mainHandler->db()->select(cbAclDeny))
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return true;
}
@@ -92,7 +92,7 @@ bool HandlerGroup::init()
if (ret.error())
{
delete ifs;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
bRet = false;
return;
}
@@ -100,19 +100,19 @@ bool HandlerGroup::init()
};
if (!m_mainHandler->db()->select(cbGroup) || !bRet)
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return false;
}
DEBUG_LOG() << "m_exeObjMap.size() = " << m_groupObjMap.size();
INFO_LOG() << "Handler Group initialized";
DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_groupObjMap.size();
INFO_LOG(m_logger) << "Handler Group initialized";
return true;
}
void HandlerGroup::updateRolePresetId(const int operatorId, const int rolePresetId)
{
DEBUG_LOG() << "updateRolePresetId "
DEBUG_LOG(m_logger) << "updateRolePresetId "
<< " operatorId=" << operatorId
<< " rolePresetId=" << rolePresetId;
m_mainHandler->getHandlerOperator()->operatorModifyRolePresetId( operatorId, rolePresetId);
@@ -139,12 +139,12 @@ Core::FunctionReplyObject HandlerGroup::changeMembership(const OperatorManagemen
void HandlerGroup::onGroupChangeMembershipsRequest(const rti::core::SampleIdentity &cookie,
const GroupChangeMembersRequest &request)
{
DEBUG_LOG() << "onGroupChangeMembershipsRequest " << request;
DEBUG_LOG(m_logger) << "onGroupChangeMembershipsRequest " << request;
Core::FunctionReplyObject ret = changeMembership(request);
if (request.operatorId().is_set() && request.rolePresetId().is_set())
updateRolePresetId(request.operatorId().get(), request.rolePresetId().get());
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
m_mainHandler->fts()->groupChangeMembershipsReply(cookie, ret);
}
@@ -176,10 +176,10 @@ Core::FunctionReplyObject HandlerGroup::create(const GroupCreateRequest &request
void HandlerGroup::onGroupCreateRequest(const rti::core::SampleIdentity &cookie,
const GroupCreateRequest &request)
{
DEBUG_LOG() << "onGroupCreateRequest" << request;
DEBUG_LOG(m_logger) << "onGroupCreateRequest" << request;
Core::FunctionReplyObject ret = create(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
m_mainHandler->fts()->groupCreateReply(cookie, ret);
}
@@ -207,7 +207,7 @@ Core::FunctionReplyObject HandlerGroup::changeName(const OperatorManagement::Gro
void HandlerGroup::onGroupChangeNameRequest(const rti::core::SampleIdentity &cookie,
const GroupChangeNameRequest &request)
{
DEBUG_LOG() << "onGroupChangeNameRequest" << request;
DEBUG_LOG(m_logger) << "onGroupChangeNameRequest" << request;
Core::FunctionReplyObject ret;
ObjectGroup *ifs = m_groupObjMap.value(request.id());
@@ -259,10 +259,10 @@ Core::FunctionReplyObject HandlerGroup::remove(const Core::RemoveElementRequest
void HandlerGroup::onGroupRemoveRequest(const rti::core::SampleIdentity &cookie,
const Core::RemoveElementRequest &request)
{
DEBUG_LOG() << "onGroupRemoveRequest" << request;
DEBUG_LOG(m_logger) << "onGroupRemoveRequest" << request;
Core::FunctionReplyObject ret = remove(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
m_mainHandler->fts()->groupRemoveReply(cookie, ret);
}
@@ -34,6 +34,7 @@ public:
Core::FunctionReplyObject remove(const Core::RemoveElementRequest &request);
private:
NGL::INGLLogger &m_logger;
void onGroupChangeMembershipsRequest(const rti::core::SampleIdentity &cookie,
const GroupChangeMembersRequest &request) override;
void onGroupCreateRequest(const rti::core::SampleIdentity &cookie,
@@ -46,6 +47,7 @@ private:
void updateRolePresetId( const int operatorId, const int rolePresetId);
private:
NGL::INGLLogger &m_logger;
QMap<int, ObjectGroup*> m_groupObjMap;
QMultiMap<int, int> m_groupGroupMap;
QMultiMap<int, int> m_aclAllowMap;
@@ -53,7 +53,7 @@ bool HandlerLockedTopics::init()
auto cbDatabase = [this](const Database::OpmLockedTopics & data)
{
DEBUG_LOG() << "Locked topic from db: " << data.exerciseId.toInt() << ", " << data.workstationId
DEBUG_LOG(m_logger) << "Locked topic from db: " << data.exerciseId.toInt() << ", " << data.workstationId
<< ", " << data.operatorId << data.entityTypeName;
m_lockedTopics.insert(Core::key(data.entityId, data.exerciseId.isNull() ? 0 : data.exerciseId.toInt(), data.entityTypeName), data);
};
@@ -89,7 +89,7 @@ void HandlerLockedTopics::operatorLoggedInOut(int operatorId, int workstationId)
{
// check if there are stale locks (e.g. by crashing client) - then remove all of them - if there are any
DEBUG_LOG() << "operatorLoggedInOut: " << workstationId << ", " << operatorId;
DEBUG_LOG(m_logger) << "operatorLoggedInOut: " << workstationId << ", " << operatorId;
// Ueberall wurden - ohne erase wohlgemerkt - mutable Iteratoren verwendet. Nur hier - wo erase verwendet wurde - nicht! :')
QMutableHashIterator<Core::key, Database::OpmLockedTopics> it(m_lockedTopics);
@@ -98,7 +98,7 @@ void HandlerLockedTopics::operatorLoggedInOut(int operatorId, int workstationId)
{
const auto lockedTopic = it.next().value();
DEBUG_LOG() << "check if unlock: id=" << lockedTopic.id
DEBUG_LOG(m_logger) << "check if unlock: id=" << lockedTopic.id
<< ", exId=" << lockedTopic.exerciseId.toInt()
<< ", wsId=" << lockedTopic.workstationId
<< ", opId=" << lockedTopic.operatorId;
@@ -107,7 +107,7 @@ void HandlerLockedTopics::operatorLoggedInOut(int operatorId, int workstationId)
continue;
}
DEBUG_LOG() << "Unlocking topic: id=" << lockedTopic.id
DEBUG_LOG(m_logger) << "Unlocking topic: id=" << lockedTopic.id
<< ", exId=" << lockedTopic.exerciseId.toInt()
<< ", wsId=" << lockedTopic.workstationId
<< ", opId=" << lockedTopic.operatorId;
@@ -126,11 +126,11 @@ void HandlerLockedTopics::onTryLockEntityRequest(const rti::core::SampleIdentity
auto ret = tryLock(request);
if (!ret.errorString().empty())
{
WARNING_LOG() << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString(), ret.errorParams()).translated() << " - " << request;
WARNING_LOG(m_logger) << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString(), ret.errorParams()).translated() << " - " << request;
}
else if (ret.alreadyLocked())
{
WARNING_LOG() << "onTryLockEntityRequest failed because the topic was already locked by ws " << ret.alreadyLocked().get().workstationName() << " and op " << ret.alreadyLocked().get().operatorName() << " - " << request;
WARNING_LOG(m_logger) << "onTryLockEntityRequest failed because the topic was already locked by ws " << ret.alreadyLocked().get().workstationName() << " and op " << ret.alreadyLocked().get().operatorName() << " - " << request;
}
m_ftsTryLockEntity->sendReply(cookie, ret);
@@ -155,7 +155,7 @@ Core::TryLockEntityReply lockSuccessReply(const Database::OpmLockedTopics &dbStr
Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityRequest &request)
{
DEBUG_LOG() << "tryLock : " << request;
DEBUG_LOG(m_logger) << "tryLock : " << request;
const auto topicId = request.entityId();
@@ -191,7 +191,7 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
//Core::TryLockEntityReply HandlerLockedTopics::tryLockModify(const Core::TryLockEntityRequest &request)
//{
// DEBUG_LOG() << "tryLockModify: " << request;
// DEBUG_LOG(m_logger) << "tryLockModify: " << request;
// const auto lockEntityId = request.id();
@@ -260,7 +260,7 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
// }
// const Database::OpmLockedTopics &lockedTopic = *lockedTopicIt;
// DEBUG_LOG() << Q_FUNC_INFO << ": locked topic id " << lockedTopic.id;
// DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": locked topic id " << lockedTopic.id;
// // ... and then reinserting the updated lock entity (as the id has now changed) - while the key (op, ws, exc, topic id) stays the same!
// m_lockedTopics[requestedKey] = dbStruct;
// }
@@ -270,7 +270,7 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
//bool HandlerLockedTopics::removeReleaseOutdatedLock(const int lockEntityId)
//{
// DEBUG_LOG() << "removeReleaseOutdatedLock: lockEntityId = " << lockEntityId;
// DEBUG_LOG(m_logger) << "removeReleaseOutdatedLock: lockEntityId = " << lockEntityId;
// auto lockedTopicIt = std::find_if(m_lockedTopics.constBegin(), m_lockedTopics.constEnd(),
// [&lockEntityId](const Database::OpmLockedTopics &lockedTopic)
@@ -280,13 +280,13 @@ Core::TryLockEntityReply HandlerLockedTopics::tryLock(const Core::TryLockEntityR
// if (lockedTopicIt == m_lockedTopics.constEnd())
// {
// ERROR_LOG() << Q_FUNC_INFO << ": Failed to release outdated lock as lock entity id ("<<lockedTopicIt<<") was not found!";
// ERROR_LOG(m_logger) << Q_FUNC_INFO << ": Failed to release outdated lock as lock entity id ("<<lockedTopicIt<<") was not found!";
// Q_ASSERT(false);
// return false;
// }
// const Database::OpmLockedTopics &lockedTopic = *lockedTopicIt;
// DEBUG_LOG() << Q_FUNC_INFO << ": found lock entity " << lockEntityId;
// DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": found lock entity " << lockEntityId;
// unlockInDb(lockedTopic);
// removeLockedEntity(lockEntityId);
@@ -305,7 +305,7 @@ void HandlerLockedTopics::onTryUnlockEntityRequest(const rti::core::SampleIdenti
auto ret = tryUnlock(request);
if (!ret.errorString().empty())
{
WARNING_LOG() << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString(), ret.errorParams()).translated() << " - " << request;
WARNING_LOG(m_logger) << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString(), ret.errorParams()).translated() << " - " << request;
}
m_ftsTryUnlockEntity->sendReply(cookie, ret);
@@ -315,7 +315,7 @@ void HandlerLockedTopics::onTryUnlockEntityRequest(const rti::core::SampleIdenti
Core::FunctionReply HandlerLockedTopics::tryUnlock(const Core::TryUnlockEntityRequest &request)
{
DEBUG_LOG() << "tryUnlock: " << request;
DEBUG_LOG(m_logger) << "tryUnlock: " << request;
const auto lockEntityId = request.id();
@@ -366,7 +366,7 @@ bool HandlerLockedTopics::publishLockedEntity(const Core::LockedEntity &entity)
m_dtsLockedEntity->write(entity);
return true;
}
ERROR_LOG() << "Publishing LockedEntity " << entity.id() << " failed: DTS not available!";
ERROR_LOG(m_logger) << "Publishing LockedEntity " << entity.id() << " failed: DTS not available!";
return false;
}
@@ -379,7 +379,7 @@ bool HandlerLockedTopics::removeLockedEntity(int64_t id)
m_dtsLockedEntity->remove(entity);
return true;
}
ERROR_LOG() << "Removing LockedEntity " << entity.id() << " failed: DTS not available!";
ERROR_LOG(m_logger) << "Removing LockedEntity " << entity.id() << " failed: DTS not available!";
return false;
}
@@ -404,14 +404,14 @@ void HandlerLockedTopics::dumpLockedTopics(int line)
{
QHashIterator<Core::key, Database::OpmLockedTopics> it (m_lockedTopics);
INFO_LOG() << " dump m_lockedTopics, START size= " << m_lockedTopics.size()
INFO_LOG(m_logger) << " dump m_lockedTopics, START size= " << m_lockedTopics.size()
<< " (callerline=" << line << ")";
while (it.hasNext())
{
it.next();
const Core::key &keyRef = it.key();
const Database::OpmLockedTopics &valRef = it.value();
INFO_LOG() << " entityTypeName=" << keyRef.entityTypeName << "'"
INFO_LOG(m_logger) << " entityTypeName=" << keyRef.entityTypeName << "'"
<< ", entityId=" << keyRef.entityId
<< ", exerciseId=" << keyRef.exerciseId
<< " - eTN=" << valRef.entityTypeName
@@ -419,7 +419,7 @@ void HandlerLockedTopics::dumpLockedTopics(int line)
<< ", exId=" << valRef.exerciseId.toInt()
<< ", opId=" << valRef.operatorId;
}
INFO_LOG() << " dump m_lockedTopics, END size= " << m_lockedTopics.size();
INFO_LOG(m_logger) << " dump m_lockedTopics, END size= " << m_lockedTopics.size();
}
} // namespace
@@ -53,7 +53,7 @@ bool HandlerOperator::init()
// read all Operators from database
if (!m_mainHandler->db()->select(dataVec))
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return true;
}
@@ -61,17 +61,17 @@ bool HandlerOperator::init()
// read all Operators from database
if (!m_mainHandler->db()->select(partyExerciseVec))
{
ERROR_LOG() << "Error reading data from database!";
ERROR_LOG(m_logger) << "Error reading data from database!";
return true;
}
QMap<int, QVector<Database::OpmOperatorExercise> > opMap;
for (const auto &elem : partyExerciseVec)
{
INFO_LOG() << "---------- elem.operatorId:" << elem.operatorId
INFO_LOG(m_logger) << "---------- elem.operatorId:" << elem.operatorId
<< ", elem size " << elem.visibleParties().size();
opMap[elem.operatorId] << elem;
}
INFO_LOG() << "------- opMap size" << opMap.size();
INFO_LOG(m_logger) << "------- opMap size" << opMap.size();
OperatorManagement::OperatorWorkstationAlive alive;
alive.lastAlive(QDateTime::currentMSecsSinceEpoch());
@@ -82,7 +82,7 @@ bool HandlerOperator::init()
if (ret.error())
{
delete ifs;
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
return false;
}
if (m_logger.isDebugEnabled())
@@ -92,7 +92,7 @@ bool HandlerOperator::init()
stringList.reserve(acls.size());
for (int acl : acls)
stringList << QString::number(acl);
DEBUG_LOG() << "Effective ACLs for Operator " << op.name << "(id: " << op.id << "): "
DEBUG_LOG(m_logger) << "Effective ACLs for Operator " << op.name << "(id: " << op.id << "): "
<< stringList.join(QLatin1String(", "));
}
ifs->updateExercises(getExercisesForOperator(exMappingVec, op.id), true);
@@ -110,7 +110,7 @@ bool HandlerOperator::init()
this, &HandlerOperator::onOperatorWorkstationAliveChanged);
dtc->enableOperatorWorkstationAlive();
DEBUG_LOG() << "m_exeObjMap.size() = " << m_operatorObjMap.size();
DEBUG_LOG(m_logger) << "m_exeObjMap.size() = " << m_operatorObjMap.size();
return true;
}
@@ -138,7 +138,7 @@ std::vector<int> HandlerOperator::getExercisesForOperator(const QVector<Database
void HandlerOperator::onOperatorChangePasswordRequest(const rti::core::SampleIdentity &cookie,
const OperatorChangePasswordRequest &request)
{
DEBUG_LOG() << "onOperatorChangePasswordRequest()";
DEBUG_LOG(m_logger) << "onOperatorChangePasswordRequest()";
ObjectOperator *ifs = m_operatorObjMap.value(request.id());
if (!ifs)
{
@@ -184,14 +184,14 @@ void HandlerOperator::onOperatorCreateModifyRequest(const rti::core::SampleIdent
const OperatorCreateModifyRequest &request)
{
Core::FunctionReplyObject ret;
DEBUG_LOG() << "onOperatorCreateModifyRequest()";
DEBUG_LOG(m_logger) << "onOperatorCreateModifyRequest()";
if (!request.id().is_set())
ret = operatorCreateRequest(request);
else
ret = operatorModifyRequest(request);
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
m_mainHandler->fts()->operatorCreateModifyReply(cookie, ret);
}
@@ -268,13 +268,13 @@ Core::FunctionReplyObject HandlerOperator::operatorCreateRequest(const OperatorC
void HandlerOperator::operatorModifyRolePresetId( int operatorId, int rolePresetId)
{
DEBUG_LOG()<< "HandlerOperator::operatorModifyRolePresetId"
DEBUG_LOG(m_logger)<< "HandlerOperator::operatorModifyRolePresetId"
<< " operatorId=" << operatorId
<< " rolePresetId=" << rolePresetId;
ObjectOperator *ifs = m_operatorObjMap.value(operatorId);
if (!ifs)
{
ERROR_LOG()<< "No valid operator id given: "<< operatorId;
ERROR_LOG(m_logger)<< "No valid operator id given: "<< operatorId;
return;
}
@@ -341,7 +341,7 @@ Core::FunctionReplyObject HandlerOperator::operatorModifyRequest(const OperatorC
void HandlerOperator::onOperatorRemoveRequest(const rti::core::SampleIdentity &cookie,
const Core::RemoveElementRequest &request)
{
DEBUG_LOG() << "onOperatorRemoveRequest()" << request;
DEBUG_LOG(m_logger) << "onOperatorRemoveRequest()" << request;
ObjectOperator *ifs = m_operatorObjMap.value(request.id());
if (!ifs)
@@ -372,7 +372,7 @@ void HandlerOperator::onOperatorRemoveRequest(const rti::core::SampleIdentity &c
Core::FunctionReplyObject ret = m_mainHandler->getHandlerGroup()->remove(groupRemoveRequest);
if (ret.error())
{
ERROR_LOG() << ret();
ERROR_LOG(m_logger) << ret();
}
else
{
@@ -389,7 +389,7 @@ void HandlerOperator::onOperatorRemoveRequest(const rti::core::SampleIdentity &c
void HandlerOperator::onOperatorLoginRequest(const rti::core::SampleIdentity &cookie,
const OperatorLoginRequest &request)
{
DEBUG_LOG() << "OperatorLoginRequest: " << request;
DEBUG_LOG(m_logger) << "OperatorLoginRequest: " << request;
ObjectOperator *ifs = m_operatorObjMap.value(request.id());
if (!ifs)
@@ -460,7 +460,7 @@ void HandlerOperator::onOperatorLoginRequest(const rti::core::SampleIdentity &co
OperatorLogoutRequest req;
req.id(otherOperatorId);
onOperatorLogoutRequest(cookie, req);
WARNING_LOG() << "Logged out operator " << otherOperatorId << " on workstation id " << request.workstationId();
WARNING_LOG(m_logger) << "Logged out operator " << otherOperatorId << " on workstation id " << request.workstationId();
}
}
// Claim WS:
@@ -471,7 +471,7 @@ void HandlerOperator::onOperatorLoginRequest(const rti::core::SampleIdentity &co
}
if (ret.error())
WARNING_LOG() << ret();
WARNING_LOG(m_logger) << ret();
else
{
m_mainHandler->getHandlerLockedTopics()->operatorLoggedIn(request.id(), request.workstationId());
@@ -491,7 +491,7 @@ int HandlerOperator::getLoggedOperatorId(int workstationId) const
void HandlerOperator::onOperatorLogoutRequest(const rti::core::SampleIdentity &cookie,
const OperatorLogoutRequest &request)
{
DEBUG_LOG() << "OperatorLogoutRequest: " << request;
DEBUG_LOG(m_logger) << "OperatorLogoutRequest: " << request;
ObjectOperator *ifs = m_operatorObjMap.value(request.id());
if (!ifs)
@@ -566,10 +566,10 @@ void HandlerOperator::onOperatorGetSetSettingsRequest(const rti::core::SampleIde
void HandlerOperator::onOperatorApplyForeignAclsRequest(const rti::core::SampleIdentity &cookie, const OperatorApplyForeignAclsRequest &request)
{
DEBUG_LOG() << "peratorApplyForeignAclsRequest: " << request;
DEBUG_LOG(m_logger) << "peratorApplyForeignAclsRequest: " << request;
auto reply = operatorApplyForeignAclsRequest(request);
if (reply.error())
WARNING_LOG() << reply();
WARNING_LOG(m_logger) << reply();
m_mainHandler->fts()->operatorApplyForeignAclsReply(cookie, reply);
}
@@ -589,11 +589,11 @@ Core::FunctionReplyObject HandlerOperator::operatorApplyForeignAclsRequest(const
void HandlerOperator::onOperatorUpdateVisiblePartiesByExerciseRequest(const rti::core::SampleIdentity &cookie,
const OperatorUpdateVisiblePartiesByExerciseRequest &request)
{
DEBUG_LOG() << Q_FUNC_INFO << request;
// DEBUG_LOG() << "onOperatorUpdateVisiblePartiesByExerciseRequest: " << request;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << request;
// DEBUG_LOG(m_logger) << "onOperatorUpdateVisiblePartiesByExerciseRequest: " << request;
Core::FunctionReplyObject reply = operatorUpdateVisiblePartiesByExerciseRequest(request);
if (reply.error())
WARNING_LOG() << reply();
WARNING_LOG(m_logger) << reply();
m_mainHandler->fts()->operatorUpdateVisiblePartiesByExerciseReply(cookie, reply);
}
@@ -625,7 +625,7 @@ void HandlerOperator::reloadAcls()
void HandlerOperator::onOperatorWorkstationAliveChanged(const OperatorManagement::OperatorWorkstationAlive &data, DataModification modType)
{
INFO_LOG() << "onOperatorWorkstationAliveChanged: " << data << ", " << modType;
INFO_LOG(m_logger) << "onOperatorWorkstationAliveChanged: " << data << ", " << modType;
if (data.operatorId() < 0)
{
m_aliveData.remove(data.workstationId());
@@ -645,11 +645,11 @@ void HandlerOperator::onCheckAliveTimeout()
return;
const qint64 tTimeoutTime = QDateTime::currentMSecsSinceEpoch() - 90 * 1000; // 90s
DEBUG_LOG() << "onCheckAliveTimeout, timeoutTime: " << tTimeoutTime;
DEBUG_LOG(m_logger) << "onCheckAliveTimeout, timeoutTime: " << tTimeoutTime;
auto it = m_aliveData.begin();
while (it != m_aliveData.end())
{
DEBUG_LOG() << "Checking alive for workstation " << it.key();
DEBUG_LOG(m_logger) << "Checking alive for workstation " << it.key();
auto &events = it.value();
if (events.isEmpty() || events.last().lastAlive() >= tTimeoutTime)
{
@@ -659,12 +659,12 @@ void HandlerOperator::onCheckAliveTimeout()
// no reference, will be a dangling one after m_aliveData.erase(it) !
const OperatorWorkstationAlive owa = events.last();
WARNING_LOG() << "Timeout for workstation " << owa.workstationId()
WARNING_LOG(m_logger) << "Timeout for workstation " << owa.workstationId()
<< " and operator " << owa.operatorId() << " - logging out";
if (m_logger.isDebugEnabled())
{
for (const auto &event : events)
DEBUG_LOG() << "Alive history: " << event;
DEBUG_LOG(m_logger) << "Alive history: " << event;
}
ObjectOperator *ifs = m_operatorObjMap.value(owa.operatorId());
it = m_aliveData.erase(it);
@@ -42,6 +42,7 @@ public:
QString operatorNameById(int operatorId) const;
private:
NGL::INGLLogger &m_logger;
void onOperatorChangePasswordRequest(const rti::core::SampleIdentity &cookie,
const OperatorChangePasswordRequest &request) override;
void onOperatorCreateModifyRequest(const rti::core::SampleIdentity &cookie,
@@ -75,6 +76,7 @@ private:
private Q_SLOTS:
void onCheckAliveTimeout();
private:
NGL::INGLLogger &m_logger;
QHash<int, QVector<OperatorWorkstationAlive>> m_aliveData;
QHash<int, ObjectOperator*> m_operatorObjMap;
QTimer *m_aliveCheckTimer;
@@ -48,7 +48,7 @@ bool MainHandler::init(int domainId)
if (!m_dbHandler->init(0, Settings::settings()))
{
ERROR_LOG() << "Initialisation dbHandler failed.";
ERROR_LOG(m_logger) << "Initialisation dbHandler failed.";
return false;
}
@@ -117,14 +117,14 @@ bool MainHandler::initWebSocketHandler()
{
// WebSocketServer
m_handlerWebSocket = std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(this);
DEBUG_LOG() << "Reset WebSocketInterfaceHandler succesful.";
DEBUG_LOG(m_logger) << "Reset WebSocketInterfaceHandler succesful.";
if (!m_handlerWebSocket->init())
{
ERROR_LOG() << "Initialisation WebSocketInterfaceHandler failed.";
ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
return false;
}
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer);
DEBUG_LOG() << "Initialisation WebSocketInterfaceHandler succesful.";
DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler succesful.";
return true;
}
@@ -48,6 +48,7 @@ public:
std::shared_ptr<HandlerActiveApps> getHandlerActiveApps() const { return m_handlerActiveApps; }
private:
NGL::INGLLogger &m_logger;
bool initAclHandler();
bool initOperatorHandler();
bool initGroupHandler();
@@ -56,6 +57,7 @@ private:
bool initActiveApps();
private:
NGL::INGLLogger &m_logger;
std::shared_ptr<HandlerAccessControlLevel> m_handlerAcl;
std::shared_ptr<HandlerOperator> m_handlerOperator;
std::shared_ptr<HandlerGroup> m_handlerGroup;
@@ -55,11 +55,11 @@ void ObjectAccessControlLevel::onPublishData()
ddsData.description(m_data.description.toStdString());
// Todo: Copy as above
INFO_LOG() << "Publish OpmAccessControlLevel-data to dds (" << m_data.id << ") ...";
INFO_LOG(m_logger) << "Publish OpmAccessControlLevel-data to dds (" << m_data.id << ") ...";
if (!m_mainHandler->dts()->publish(ddsData))
{
ERROR_LOG() << "Error publishing OpmAccessControlLevel-data to dds";
ERROR_LOG(m_logger) << "Error publishing OpmAccessControlLevel-data to dds";
}
}
@@ -28,6 +28,7 @@ public:
qint64 getId() const { return m_data.id; }
protected:
NGL::INGLLogger &m_logger;
void onPublishData();
private:
@@ -228,11 +228,11 @@ void ObjectGroup::onPublishData()
ddsData.type(m_data.typeId);
ddsData.isMemberOf(m_isMemberOf);
INFO_LOG() << "Publish OpmGroup-data to dds (" << m_data.id << ") ...";
INFO_LOG(m_logger) << "Publish OpmGroup-data to dds (" << m_data.id << ") ...";
if (!m_mainHandler->dts()->publish(ddsData))
{
ERROR_LOG() << "Error publishing OpmGroup-data to dds";
ERROR_LOG(m_logger) << "Error publishing OpmGroup-data to dds";
}
}
@@ -41,6 +41,7 @@ public:
QString name() const { return m_data.name; }
protected:
NGL::INGLLogger &m_logger;
void onPublishData();
private:
@@ -92,13 +92,13 @@ Core::FunctionReplyObject ObjectOperator::updateExercises(const std::vector<int>
}
if (mapping.visibleParties().empty())
{
DEBUG_LOG()<< "Update Operator visible Parties for Execise: No parties found for " << exerciseId << " use default (ex0)";
DEBUG_LOG(m_logger)<< "Update Operator visible Parties for Execise: No parties found for " << exerciseId << " use default (ex0)";
// Add default visibleParties from ex0
mapping.visibleParties = m_data.visibleParties;
}
if (!m_mainHandler->db()->insert(mapping))
INFO_LOG() << "Can not add operator " << mapping.operatorId << " to exercise " << exerciseId << " - exercise does no longer exist";
INFO_LOG(m_logger) << "Can not add operator " << mapping.operatorId << " to exercise " << exerciseId << " - exercise does no longer exist";
else
{
if (std::find(m_exercises.begin(), m_exercises.end(), exerciseId) == m_exercises.end())
@@ -116,7 +116,7 @@ Core::FunctionReplyObject ObjectOperator::updateExercises(const std::vector<int>
Core::FunctionReplyObject ObjectOperator::updateObject(const Database::OpmOperator &data)
{
m_data.name = data.name;
DEBUG_LOG() << "ObjectOperator::updateObject"
DEBUG_LOG(m_logger) << "ObjectOperator::updateObject"
<< " data.id = " << data.id
<< " data.rolePresetId = " << data.rolePresetId;
m_data.description = data.description;
@@ -133,7 +133,7 @@ Core::FunctionReplyObject ObjectOperator::updateObject(const Database::OpmOperat
if (!m_mainHandler->db()->update(m_data))
{
ERROR_LOG()<< "Error updating Operator in database: " << m_mainHandler->db()->getLastError().text();
ERROR_LOG(m_logger)<< "Error updating Operator in database: " << m_mainHandler->db()->getLastError().text();
return Core::FunctionReplyObject(0, tr_lts("dds", "Error updating operator in database."));
}
m_data.primaryGroupId = data.primaryGroupId;
@@ -144,13 +144,13 @@ Core::FunctionReplyObject ObjectOperator::updateObject(const Database::OpmOperat
Core::FunctionReplyObject ObjectOperator::updateOperatorExercise(const Database::OpmOperatorExercise &data)
{
DEBUG_LOG() << Q_FUNC_INFO << data.operatorId << " " << data.exerciseId;
DEBUG_LOG(m_logger) << Q_FUNC_INFO << data.operatorId << " " << data.exerciseId;
// insert can fail due to (deleted) exerciseId
m_mainHandler->db()->setEmitMessageOnError(false);
for (int i=0; i < m_dataExercise.size(); ++i)
{
DEBUG_LOG() << "** m_dataExercise.at(" << i << "): " << m_dataExercise.at(i).exerciseId << "==" << data.exerciseId;
DEBUG_LOG(m_logger) << "** m_dataExercise.at(" << i << "): " << m_dataExercise.at(i).exerciseId << "==" << data.exerciseId;
if (m_dataExercise.at(i).exerciseId != data.exerciseId)
continue;
Database::OpmOperatorExercise mapping = m_dataExercise.at(i);
@@ -159,16 +159,16 @@ Core::FunctionReplyObject ObjectOperator::updateOperatorExercise(const Database:
mapping.properties = data.properties;
m_dataExercise.replace(i, mapping);
DEBUG_LOG() << "** m_dataExercise.at(" << i << "): " << m_dataExercise.at(i).operatorId << ", "
DEBUG_LOG(m_logger) << "** m_dataExercise.at(" << i << "): " << m_dataExercise.at(i).operatorId << ", "
<< m_dataExercise.at(i).exerciseId << ", "
<< m_dataExercise.at(i).visibleParties.toPgString() << ", "
<< m_dataExercise.at(i).hiddenParties.toPgString();
DEBUG_LOG() << "** mapping: " << mapping.operatorId << ", "
DEBUG_LOG(m_logger) << "** mapping: " << mapping.operatorId << ", "
<< mapping.exerciseId << ", "
<< mapping.visibleParties.toPgString() << ", "
<< mapping.hiddenParties.toPgString();
if (!m_mainHandler->db()->update(mapping))
ERROR_LOG()<< "Error updating OperatorExecise in database: " << m_mainHandler->db()->getLastError().text();
ERROR_LOG(m_logger)<< "Error updating OperatorExecise in database: " << m_mainHandler->db()->getLastError().text();
}
m_mainHandler->db()->setEmitMessageOnError(true);
@@ -236,7 +236,7 @@ void ObjectOperator::reloadAcls(bool force)
// QStringList stringList;
// for (int acl : calculatedAcls)
// stringList << QString::number(acl);
// DEBUG_LOG() << "Effective ACLs for Operator " << m_data.name << "(id: " << m_data.id << "): " << stringList.join(QLatin1String(", "));
// DEBUG_LOG(m_logger) << "Effective ACLs for Operator " << m_data.name << "(id: " << m_data.id << "): " << stringList.join(QLatin1String(", "));
if (force || m_effectiveAcls != calculatedAcls)
updateEffectiveAcls(calculatedAcls);
@@ -336,12 +336,12 @@ void ObjectOperator::onPublishData()
op.rolePresetId(m_data.rolePresetId);
op.properties(m_data.properties.toStdString());
INFO_LOG() << "Publish OpmOperator-data to dds (" << m_data.id
INFO_LOG(m_logger) << "Publish OpmOperator-data to dds (" << m_data.id
<< " rolePresetId =" << m_data.rolePresetId
<< ") ...";
if (!m_mainHandler->dts()->publish(op))
ERROR_LOG() << "Error publishing OpmOperator-data to dds";
ERROR_LOG(m_logger) << "Error publishing OpmOperator-data to dds";
}
std::vector<OperatorManagement::PartiesByExercise> ObjectOperator::toDdsData(const QVector<Database::OpmOperatorExercise> &dbData)
@@ -41,6 +41,7 @@ public:
QSet<int> effectiveAcls() const { return m_effectiveAcls; }
void reloadAcls(bool force = false);
protected:
NGL::INGLLogger &m_logger;
void onPublishData();
private: