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

@@ -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);
}