Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+7
-7
@@ -46,7 +46,7 @@ bool HandlerSituationReplay::init(int exerciseId, int partitionId)
|
||||
NSqlQuery q(m_db->database());
|
||||
const qint64 exerciseStartTime = (q.execAndFetch(stmt) ? q.value(0).toLongLong() : 0);
|
||||
|
||||
DEBUG_LOG() << "stmt: " << stmt << ", res " << exerciseStartTime;
|
||||
DEBUG_LOG(m_logger) << "stmt: " << stmt << ", res " << exerciseStartTime;
|
||||
|
||||
Database::SrpSituationReplay newData;
|
||||
newData.srpStateId = SrpState::Stopped;
|
||||
@@ -67,14 +67,14 @@ bool HandlerSituationReplay::createObject(const Database::SrpSituationReplay &ne
|
||||
{
|
||||
delete m_objSrp;
|
||||
m_objSrp = nullptr;
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
}
|
||||
return m_objSrp != nullptr;
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject HandlerSituationReplay::startReplayRequest(const SituationReplay::ChangeReplayStateRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onStartReplayRequest: " << request;
|
||||
DEBUG_LOG(m_logger) << "onStartReplayRequest: " << request;
|
||||
// Start only own replay
|
||||
if (request.replayPartitionId() != m_partitionId)
|
||||
return Core::FunctionReplyObject(request.replayPartitionId(),tr_lts("dds", "Wrong replay partition"));
|
||||
@@ -102,7 +102,7 @@ Core::FunctionReplyObject HandlerSituationReplay::startReplayRequest(const Situa
|
||||
|
||||
Core::FunctionReplyObject HandlerSituationReplay::stopReplayRequest(const SituationReplay::ChangeReplayStateRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onStopReplayRequest: " << request;
|
||||
DEBUG_LOG(m_logger) << "onStopReplayRequest: " << request;
|
||||
|
||||
if (m_objSrp == nullptr)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "SituationReplay for replayPartitionId %1 not found")).arg(request.replayPartitionId());
|
||||
@@ -144,7 +144,7 @@ Core::FunctionReplyObject HandlerSituationReplay::changeReplayStateRequest(const
|
||||
return startReplayRequest(request);
|
||||
case SrpState_def::Resumed:
|
||||
{
|
||||
DEBUG_LOG() << "Resume request: " << request.beginTime() << ", cur playback time: " << m_objSrp->currentReplayTime();
|
||||
DEBUG_LOG(m_logger) << "Resume request: " << request.beginTime() << ", cur playback time: " << m_objSrp->currentReplayTime();
|
||||
if (request.beginTime() != 0 && request.beginTime() != m_objSrp->currentReplayTime())
|
||||
{
|
||||
stopReplayRequest(request);
|
||||
@@ -163,10 +163,10 @@ Core::FunctionReplyObject HandlerSituationReplay::changeReplayStateRequest(const
|
||||
void HandlerSituationReplay::onChangeReplayStateRequest(const rti::core::SampleIdentity &cookie,
|
||||
const ChangeReplayStateRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onChangeReplayStateRequest: " << request;
|
||||
DEBUG_LOG(m_logger) << "onChangeReplayStateRequest: " << request;
|
||||
auto ret = changeReplayStateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG() << ret();
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_ddsHandler->fts()->changeReplayStateReply(cookie, ret);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user