Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+9
-9
@@ -37,7 +37,7 @@ public:
|
||||
Database::AvmDeviceConfig deviceConfig = toDeviceConfig(videoTeam);
|
||||
|
||||
if (!m_db->insert(deviceConfig))
|
||||
ERROR_LOG() << "Error while inserting device config into database";
|
||||
ERROR_LOG(m_logger) << "Error while inserting device config into database";
|
||||
|
||||
m_cache.insert(videoTeam.id(), deviceConfig);
|
||||
emit m_handler->avDbReloadNeeded();
|
||||
@@ -53,7 +53,7 @@ public:
|
||||
deviceConfig.id = oldDeviceConfig.id;
|
||||
|
||||
if (!m_db->update(deviceConfig))
|
||||
ERROR_LOG() << "Error while updating device config";
|
||||
ERROR_LOG(m_logger) << "Error while updating device config";
|
||||
|
||||
m_cache[videoTeam.id()] = deviceConfig;
|
||||
emit m_handler->avDbReloadNeeded();
|
||||
@@ -73,7 +73,7 @@ public:
|
||||
Q_ASSERT(found != m_cache.end());
|
||||
|
||||
if (!m_db->removeAvmDeviceConfig(found->id))
|
||||
ERROR_LOG() << "Error while removing device config";
|
||||
ERROR_LOG(m_logger) << "Error while removing device config";
|
||||
|
||||
m_cache.erase(found);
|
||||
emit m_handler->avDbReloadNeeded();
|
||||
@@ -137,7 +137,7 @@ bool HandlerVideoTeam::init()
|
||||
// read all VideoTeam Data from database
|
||||
if (!m_db->select(dataVec))
|
||||
{
|
||||
ERROR_LOG() << "Error reading data from database!";
|
||||
ERROR_LOG(m_logger) << "Error reading data from database!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -150,7 +150,7 @@ bool HandlerVideoTeam::init()
|
||||
if (ret.error())
|
||||
{
|
||||
delete ifs;
|
||||
ERROR_LOG() << ret();
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
return false;
|
||||
}
|
||||
m_videoTeamObjMap.insert(ifs->getId(), ifs);
|
||||
@@ -159,7 +159,7 @@ bool HandlerVideoTeam::init()
|
||||
m_deviceConfig->create(ddsData);
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "m_VideoTeamObjMap.size() = " << m_videoTeamObjMap.size();
|
||||
DEBUG_LOG(m_logger) << "m_VideoTeamObjMap.size() = " << m_videoTeamObjMap.size();
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -176,10 +176,10 @@ QMap<int, VideoTeam> HandlerVideoTeam::videoTeams() const
|
||||
void HandlerVideoTeam::onVideoTeamModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
const VideoTeamModifyRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onVideoTeamModifyRequest: " << request;
|
||||
DEBUG_LOG(m_logger) << "onVideoTeamModifyRequest: " << request;
|
||||
auto ret = request.id() > 0 ? videoTeamModifyRequest(request) : videoTeamCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG() << ret();
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_fts->videoTeamModifyReply(cookie, ret);
|
||||
}
|
||||
|
||||
@@ -232,7 +232,7 @@ Core::FunctionReplyObject HandlerVideoTeam::videoTeamModifyRequest(const VideoTe
|
||||
ObjectVideoTeam *ifs = m_videoTeamObjMap.value(request.id());
|
||||
if (ifs == nullptr)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Video Team with id %1 not found")).arg(request.id());
|
||||
DEBUG_LOG() << "on Modify Request" << request.streamName() << " ID: " << request.name() << " exId " << request.exerciseId();
|
||||
DEBUG_LOG(m_logger) << "on Modify Request" << request.streamName() << " ID: " << request.name() << " exId " << request.exerciseId();
|
||||
|
||||
VideoTeam ddsData = convert(request, ifs->getData());
|
||||
if (needDeviceConfig(ddsData))
|
||||
|
||||
Reference in new issue
Block a user