Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+12
-12
@@ -57,7 +57,7 @@ bool HandlerSituationReplaySqlite::createObject(const Database::SrpSituationRepl
|
||||
{
|
||||
delete m_objSrp;
|
||||
m_objSrp = nullptr;
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
return false;
|
||||
}
|
||||
connect(m_objSrp, &ObjectSituationReplay::replayTimeChanged, this, &HandlerSituationReplaySqlite::replayTimeChanged);
|
||||
@@ -70,7 +70,7 @@ bool HandlerSituationReplaySqlite::createObject(const Database::SrpSituationRepl
|
||||
|
||||
bool HandlerSituationReplaySqlite::onStartReplayRequest(qint64 begin, qint64 end, double pace)
|
||||
{
|
||||
DEBUG_LOG() << "onStartReplayRequest: " << begin << ", " << end << ", " << pace;
|
||||
DEBUG_LOG(m_logger) << "onStartReplayRequest: " << begin << ", " << end << ", " << pace;
|
||||
|
||||
Database::SrpSituationReplay newData;
|
||||
newData.srpStateId = SrpState::Started;
|
||||
@@ -86,11 +86,11 @@ bool HandlerSituationReplaySqlite::onStartReplayRequest(qint64 begin, qint64 end
|
||||
|
||||
bool HandlerSituationReplaySqlite::onStopReplayRequest()
|
||||
{
|
||||
DEBUG_LOG() << "onStopReplayRequest";
|
||||
DEBUG_LOG(m_logger) << "onStopReplayRequest";
|
||||
|
||||
if (m_objSrp == nullptr)
|
||||
{
|
||||
ERROR_LOG() << "onStopReplayRequest - internal error";
|
||||
ERROR_LOG(m_logger) << "onStopReplayRequest - internal error";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -99,7 +99,7 @@ bool HandlerSituationReplaySqlite::onStopReplayRequest()
|
||||
ret = m_objSrp->removeObject();
|
||||
|
||||
if (ret.error())
|
||||
WARNING_LOG() << ret();
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
|
||||
// remove all old data from DDS-Bus & clear maps
|
||||
m_dbReader->clearData();
|
||||
@@ -111,7 +111,7 @@ bool HandlerSituationReplaySqlite::onPauseReplayRequest()
|
||||
{
|
||||
if (m_objSrp == nullptr)
|
||||
{
|
||||
ERROR_LOG() << "onChangeReplayStateRequest - internal error";
|
||||
ERROR_LOG(m_logger) << "onChangeReplayStateRequest - internal error";
|
||||
return false;
|
||||
}
|
||||
return onChangeReplayStateRequest(SrpState::Paused, m_objSrp->pace());
|
||||
@@ -121,7 +121,7 @@ bool HandlerSituationReplaySqlite::onResumeReplayRequest()
|
||||
{
|
||||
if (m_objSrp == nullptr)
|
||||
{
|
||||
ERROR_LOG() << "onChangeReplayStateRequest - internal error";
|
||||
ERROR_LOG(m_logger) << "onChangeReplayStateRequest - internal error";
|
||||
return false;
|
||||
}
|
||||
return onChangeReplayStateRequest(SrpState::Resumed, m_objSrp->pace());
|
||||
@@ -130,17 +130,17 @@ bool HandlerSituationReplaySqlite::onResumeReplayRequest()
|
||||
|
||||
bool HandlerSituationReplaySqlite::onChangeReplayStateRequest(const SituationReplay::SrpState &newState, double newPace)
|
||||
{
|
||||
DEBUG_LOG() << "onChangeReplayStateRequest: " << newState << ", " << newPace;
|
||||
DEBUG_LOG(m_logger) << "onChangeReplayStateRequest: " << newState << ", " << newPace;
|
||||
|
||||
if (m_objSrp == nullptr)
|
||||
{
|
||||
ERROR_LOG() << "onChangeReplayStateRequest - internal error";
|
||||
ERROR_LOG(m_logger) << "onChangeReplayStateRequest - internal error";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (newState != SrpState::Resumed && newState != SrpState::Paused)
|
||||
{
|
||||
ERROR_LOG() << "onChangeReplayStateRequest: SrpStateChange not possible, only resumed & paused allowed";
|
||||
ERROR_LOG(m_logger) << "onChangeReplayStateRequest: SrpStateChange not possible, only resumed & paused allowed";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -148,7 +148,7 @@ bool HandlerSituationReplaySqlite::onChangeReplayStateRequest(const SituationRep
|
||||
const Core::FunctionReplyObject ret = m_objSrp->switchToState(newState);
|
||||
|
||||
if (ret.error())
|
||||
WARNING_LOG() << ret();
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
|
||||
return !ret.error();
|
||||
}
|
||||
@@ -157,7 +157,7 @@ bool HandlerSituationReplaySqlite::onPaceChangeRequest(double newPace)
|
||||
{
|
||||
if (m_objSrp == nullptr)
|
||||
{
|
||||
ERROR_LOG() << "onChangeReplayStateRequest - internal error";
|
||||
ERROR_LOG(m_logger) << "onChangeReplayStateRequest - internal error";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user