Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -31,7 +31,7 @@ HandlerSnapshot::~HandlerSnapshot()
|
||||
|
||||
bool HandlerSnapshot::init()
|
||||
{
|
||||
INFO_LOG() << "--- Start MarkerManagement HandlerSnapshot.";
|
||||
INFO_LOG(m_logger) << "--- Start MarkerManagement HandlerSnapshot.";
|
||||
|
||||
bool bRet = true;
|
||||
// create markerObjects
|
||||
@@ -44,7 +44,7 @@ bool HandlerSnapshot::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
bRet = false;
|
||||
return;
|
||||
}
|
||||
@@ -52,11 +52,11 @@ bool HandlerSnapshot::init()
|
||||
};
|
||||
if (!m_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_objectSnapshotMap.size() = " << m_objectSnapshotMap.size();
|
||||
DEBUG_LOG(m_logger) << "m_objectSnapshotMap.size() = " << m_objectSnapshotMap.size();
|
||||
|
||||
return true;
|
||||
} // end of init()
|
||||
@@ -65,10 +65,10 @@ bool HandlerSnapshot::init()
|
||||
void HandlerSnapshot::onSnapshotModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Snapshot &request)
|
||||
{
|
||||
DEBUG_LOG() << "SnapshotModifyRequest: " << request;
|
||||
DEBUG_LOG(m_logger) << "SnapshotModifyRequest: " << request;
|
||||
auto ret = request.id() > 0 ? snapshotModifyRequest(request) : snapshotCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG() << ret();
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_ddsHandler->fts()->snapshotModifyReply(cookie, ret);
|
||||
|
||||
} // end of onSnapshotModifyRequest()
|
||||
@@ -118,7 +118,7 @@ Core::FunctionReplyObject HandlerSnapshot::snapshotModifyRequest(const Snapshot
|
||||
void HandlerSnapshot::onSnapshotRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onSnapshotRemoveRequest() id:" << request.id();
|
||||
DEBUG_LOG(m_logger) << "onSnapshotRemoveRequest() id:" << request.id();
|
||||
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectSnapshot *ifs = m_objectSnapshotMap.value(request.id());
|
||||
@@ -136,7 +136,7 @@ void HandlerSnapshot::onSnapshotRemoveRequest(const rti::core::SampleIdentity &c
|
||||
}
|
||||
|
||||
if (ret.error())
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
else
|
||||
{
|
||||
// delete ObjectSnapshot
|
||||
|
||||
Reference in new issue
Block a user