Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -98,7 +98,7 @@ public:
|
||||
Database::AvmDeviceConfig deviceConfig = toDeviceConfig(config);
|
||||
|
||||
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(config.id(), deviceConfig);
|
||||
emit m_handler->avDbReloadNeeded();
|
||||
@@ -114,7 +114,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[config.id()] = deviceConfig;
|
||||
emit m_handler->avDbReloadNeeded();
|
||||
@@ -140,7 +140,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();
|
||||
@@ -196,7 +196,7 @@ bool TvcHandler::init()
|
||||
|
||||
if (!m_db->select(m_channels))
|
||||
{
|
||||
ERROR_LOG() << "Error while selecting tetra channels from db";
|
||||
ERROR_LOG(m_logger) << "Error while selecting tetra channels from db";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -207,7 +207,7 @@ bool TvcHandler::init()
|
||||
|
||||
if (!m_db->select(tvcConfigs))
|
||||
{
|
||||
ERROR_LOG() << "Error while selecting TVC configs from db";
|
||||
ERROR_LOG(m_logger) << "Error while selecting TVC configs from db";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -232,23 +232,23 @@ const TvcConfig &TvcHandler::config(int32_t id) const
|
||||
void TvcHandler::onModifyTvcConfigRequest(const rti::core::SampleIdentity &cookie,
|
||||
const ModifyTvcConfigRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onModifyTvcConfigRequest: " << request;
|
||||
DEBUG_LOG(m_logger) << "onModifyTvcConfigRequest: " << request;
|
||||
Q_ASSERT(request.id() >= 0);
|
||||
auto ret = request.id() > 0 ? modifyTvcConfig(request) : createTvcConfig(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG() << ret();
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_fts->modifyTvcConfigReply(cookie, ret);
|
||||
}
|
||||
|
||||
void TvcHandler::onRemoveTvcConfigRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onRemoveTvcConfigRequest" << request;
|
||||
DEBUG_LOG(m_logger) << "onRemoveTvcConfigRequest" << request;
|
||||
|
||||
Core::FunctionReplyObject rep = removeTvcConfig(request);
|
||||
|
||||
if (rep.error())
|
||||
WARNING_LOG() << rep.translated();
|
||||
WARNING_LOG(m_logger) << rep.translated();
|
||||
|
||||
m_fts->removeTvcConfigReply(cookie, rep);
|
||||
}
|
||||
@@ -481,7 +481,7 @@ void TvcHandler::onDbDeleteAvmTvcConfig(const QVariant &id)
|
||||
if (!m_cache.contains(configId))
|
||||
return; // the notification was a result of our own removal of the entry
|
||||
|
||||
DEBUG_LOG() << "DB deleted AvmTvcConfig with id: " << configId;
|
||||
DEBUG_LOG(m_logger) << "DB deleted AvmTvcConfig with id: " << configId;
|
||||
|
||||
removeTvcConfig(Core::RemoveElementRequest(configId));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user