Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+9
-9
@@ -47,7 +47,7 @@ bool HandlerExercisePhase::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
bRet = false;
|
||||
return;
|
||||
}
|
||||
@@ -55,11 +55,11 @@ bool HandlerExercisePhase::init()
|
||||
};
|
||||
if (!m_db->select(cbPhase) || !bRet)
|
||||
{
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
return true;
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "m_exercisePhaseObjMap.size() = " << m_exercisePhaseObjMap.size();
|
||||
DEBUG_LOG(m_logger) << "m_exercisePhaseObjMap.size() = " << m_exercisePhaseObjMap.size();
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -108,17 +108,17 @@ Core::FunctionReplyObject HandlerExercisePhase::removeAllPhasesByExerciseId(qint
|
||||
void HandlerExercisePhase::onExercisePhaseCreateRequest(const rti::core::SampleIdentity &cookie,
|
||||
const ExercisePhaseCreateRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onExercisePhaseCreateRequest " << request;
|
||||
DEBUG_LOG(m_logger) << "onExercisePhaseCreateRequest " << request;
|
||||
Core::FunctionReplyObject ret = exercisePhaseCreateRequest(request);
|
||||
if (ret.error())
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
|
||||
m_ddsHandler->fts()->exercisePhaseCreateReply(cookie, ret);
|
||||
}
|
||||
|
||||
void HandlerExercisePhase::onExercisePhaseModifyRequest(const rti::core::SampleIdentity &cookie, const ExercisePhaseModifyRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onExercisePhaseModifyRequest " << request;
|
||||
DEBUG_LOG(m_logger) << "onExercisePhaseModifyRequest " << request;
|
||||
Core::FunctionReplyObject ret;
|
||||
|
||||
ObjectExercisePhase *ifs = m_exercisePhaseObjMap.value(request.id());
|
||||
@@ -139,13 +139,13 @@ void HandlerExercisePhase::onExercisePhaseModifyRequest(const rti::core::SampleI
|
||||
|
||||
ret = ifs->updateObject(data);
|
||||
if (ret.error())
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
m_ddsHandler->fts()->exercisePhaseModifyReply(cookie, ret);
|
||||
}
|
||||
|
||||
void HandlerExercisePhase::onExercisePhaseRemoveRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onExercisePhaseRemoveRequest " << request;
|
||||
DEBUG_LOG(m_logger) << "onExercisePhaseRemoveRequest " << request;
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectExercisePhase *ifs = m_exercisePhaseObjMap.value(request.id());
|
||||
|
||||
@@ -178,7 +178,7 @@ void HandlerExercisePhase::onExercisePhaseRemoveRequest(const rti::core::SampleI
|
||||
ret = ifs->removeObject();
|
||||
|
||||
if (ret.error())
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
else
|
||||
{
|
||||
// delete ObjectExercise (including ExerciseStateMachine)
|
||||
|
||||
Reference in new issue
Block a user