Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+13
-13
@@ -49,7 +49,7 @@ bool UasHandler::init()
|
||||
// read parties from db
|
||||
if (!m_mainHandler->db()->select(uasVec))
|
||||
{
|
||||
ERROR_LOG() << "Error while reading Uas data from database";
|
||||
ERROR_LOG(m_logger) << "Error while reading Uas data from database";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ bool UasHandler::init()
|
||||
this, &UasHandler::onExerciseChanged);
|
||||
if (!m_exmDtc->enableExercise())
|
||||
{
|
||||
ERROR_LOG() << "Could not enable Topic 'Exercise' of EXM DTC";
|
||||
ERROR_LOG(m_logger) << "Could not enable Topic 'Exercise' of EXM DTC";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -89,16 +89,16 @@ void UasHandler::onCreateModifyUasRequest(const rti::core::SampleIdentity &cooki
|
||||
|
||||
void UasHandler::onRemoveUasRequest(const rti::core::SampleIdentity &cookie, const RemoveUasRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onRemoveUasRequest: " << request;
|
||||
DEBUG_LOG(m_logger) << "onRemoveUasRequest: " << request;
|
||||
auto ret = removeUas(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG() << ret();
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_mainHandler->exAnyFts()->removeUasReply(cookie, ret);
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject UasHandler::removeUas(const RemoveUasRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << "onRemoveUasRequest " << request;
|
||||
DEBUG_LOG(m_logger) << "onRemoveUasRequest " << request;
|
||||
|
||||
if (request.id() < 0)
|
||||
return Core::FunctionReplyObject(tr_lts("dds", "Got request to delete an UAS, but no valid UAS id to delete"));
|
||||
@@ -111,7 +111,7 @@ Core::FunctionReplyObject UasHandler::removeUas(const RemoveUasRequest &request)
|
||||
if (uasToDelete->participantId() > 0)
|
||||
return Core::FunctionReplyObject(tr_lts("dds", "Not possible to delete a UAS in use"));
|
||||
|
||||
DEBUG_LOG() << "Removing UAS with ID " << request.id();
|
||||
DEBUG_LOG(m_logger) << "Removing UAS with ID " << request.id();
|
||||
|
||||
return removeUas(uasToDelete);
|
||||
}
|
||||
@@ -137,7 +137,7 @@ Core::FunctionReplyObject UasHandler::removeUas(UasHandling::Uas *uasToDelete)
|
||||
//------------------------------------------------------------------------------------------
|
||||
Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &request)
|
||||
{
|
||||
DEBUG_LOG() << Q_FUNC_INFO;
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO;
|
||||
|
||||
// cant check here as we dont have access to all party participants
|
||||
/*
|
||||
@@ -145,7 +145,7 @@ Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &re
|
||||
{
|
||||
QString error = QStringLiteral("Participant with id %1 is no Uas participant.").arg(request.participantId());
|
||||
|
||||
ERROR_LOG() << error;
|
||||
ERROR_LOG(m_logger) << error;
|
||||
|
||||
return Core::FunctionReplyObject(error.toStdString().c_str());
|
||||
}*/
|
||||
@@ -168,7 +168,7 @@ Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &re
|
||||
{
|
||||
QString error = QStringLiteral("Could not insert Uas into database");
|
||||
|
||||
ERROR_LOG() << error;
|
||||
ERROR_LOG(m_logger) << error;
|
||||
|
||||
return Core::FunctionReplyObject(error.toStdString().c_str());
|
||||
}
|
||||
@@ -188,7 +188,7 @@ Core::FunctionReplyObject UasHandler::modifyUas(const CreateModifyUasRequest &re
|
||||
{
|
||||
QString error = QStringLiteral("Uas topic with id %1 not present. Not possible to modify it.").arg(request.id());
|
||||
|
||||
ERROR_LOG() << error;
|
||||
ERROR_LOG(m_logger) << error;
|
||||
|
||||
return Core::FunctionReplyObject(error.toStdString().c_str());
|
||||
}
|
||||
@@ -204,7 +204,7 @@ Core::FunctionReplyObject UasHandler::modifyUas(const CreateModifyUasRequest &re
|
||||
{
|
||||
QString error = QStringLiteral("There are no changes in modify request.");
|
||||
|
||||
ERROR_LOG() << error;
|
||||
ERROR_LOG(m_logger) << error;
|
||||
|
||||
return Core::FunctionReplyObject(error.toStdString().c_str());
|
||||
}
|
||||
@@ -215,7 +215,7 @@ Core::FunctionReplyObject UasHandler::modifyUas(const CreateModifyUasRequest &re
|
||||
{
|
||||
QString error = QStringLiteral("Participant with id %1 is no Uas participant.").arg(request.participantId());
|
||||
|
||||
ERROR_LOG() << error;
|
||||
ERROR_LOG(m_logger) << error;
|
||||
|
||||
return Core::FunctionReplyObject(error.toStdString().c_str());
|
||||
}
|
||||
@@ -233,7 +233,7 @@ bool UasHandler::isUasParticipant(int participantId) const
|
||||
|
||||
if (PARTICIPANT == nullptr)
|
||||
{
|
||||
WARNING_LOG() << "Got invalid participantId " << participantId;
|
||||
WARNING_LOG(m_logger) << "Got invalid participantId " << participantId;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user