Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+9
-10
@@ -11,9 +11,8 @@
|
||||
namespace OcSituationServer
|
||||
{
|
||||
|
||||
CentralAesDataQueue::CentralAesDataQueue(QObject *parent)
|
||||
: QObject(parent)
|
||||
{
|
||||
CentralAesDataQueue::CentralAesDataQueue(QObject *parent) : QObject(parent),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
|
||||
}
|
||||
|
||||
@@ -35,7 +34,7 @@ void CentralAesDataQueue::addRemoveMessage(int32_t aesItemId, AreaEffectSimulati
|
||||
else
|
||||
m_internalQueue.prepend({aesItemId, OcSituation::Remove, data});
|
||||
|
||||
DEBUG_LOG() << "New remove-message added: Id = " << aesItemId
|
||||
DEBUG_LOG(m_logger) << "New remove-message added: Id = " << aesItemId
|
||||
<< ", aesType = " << aesType << ". "
|
||||
<< m_internalQueue.size() << " normal, "
|
||||
<< m_internalPrioritizedQueue.size() << " prioritized and "
|
||||
@@ -114,7 +113,7 @@ QByteArray CentralAesDataQueue::getSendingData(qint32 size)
|
||||
|
||||
++messageCounter;
|
||||
|
||||
WARNING_LOG() << "Could not build data with max size of " << size << " bytes. Delivering data with " << result.size() << " bytes.";
|
||||
WARNING_LOG(m_logger) << "Could not build data with max size of " << size << " bytes. Delivering data with " << result.size() << " bytes.";
|
||||
}
|
||||
|
||||
while (!m_internalQueue.isEmpty() && ((result.size() + m_internalQueue.head().data.size()) <= size))
|
||||
@@ -131,11 +130,11 @@ QByteArray CentralAesDataQueue::getSendingData(qint32 size)
|
||||
|
||||
++messageCounter;
|
||||
|
||||
WARNING_LOG() << "Could not build data with max size of " << size << " bytes. Delivering data with " << result.size() << " bytes.";
|
||||
WARNING_LOG(m_logger) << "Could not build data with max size of " << size << " bytes. Delivering data with " << result.size() << " bytes.";
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "Data with max size = " << size << "requestet. " << result.size() << " bytes delivered.";
|
||||
DEBUG_LOG() << messageCounter << " messages are sent. "
|
||||
DEBUG_LOG(m_logger) << "Data with max size = " << size << "requestet. " << result.size() << " bytes delivered.";
|
||||
DEBUG_LOG(m_logger) << messageCounter << " messages are sent. "
|
||||
<< m_internalQueue.size() << " normal, "
|
||||
<< m_internalPrioritizedQueue.size() << " prioritized and "
|
||||
<< m_internalQueue.size() + m_internalPrioritizedQueue.size() << " remaining messages in total.";
|
||||
@@ -162,7 +161,7 @@ void CentralAesDataQueue::clearSpecificMessage(int32_t aesItemId, OcSituation::C
|
||||
{
|
||||
m_internalQueue.removeAt(counter);
|
||||
|
||||
DEBUG_LOG() << "Removed already existing message. aesItemId = " << aesItemId << ", changeType = " << changeType;
|
||||
DEBUG_LOG(m_logger) << "Removed already existing message. aesItemId = " << aesItemId << ", changeType = " << changeType;
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -174,7 +173,7 @@ void CentralAesDataQueue::clearSpecificMessage(int32_t aesItemId, OcSituation::C
|
||||
{
|
||||
m_internalPrioritizedQueue.removeAt(counter);
|
||||
|
||||
DEBUG_LOG() << "Removed already existing message. aesItemId = " << aesItemId << ", changeType = " << changeType;
|
||||
DEBUG_LOG(m_logger) << "Removed already existing message. aesItemId = " << aesItemId << ", changeType = " << changeType;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user