Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+3
-3
@@ -53,7 +53,7 @@ Core::FunctionReplyObject ObjectChargeAdministration::updateObject(const Databas
|
||||
|
||||
Core::FunctionReplyObject ObjectChargeAdministration::claimPlannedCharge(int count)
|
||||
{
|
||||
DEBUG_LOG() << "claimPlannedCharge for id : " << m_data.chargeTypeId << ", count: " << count;
|
||||
DEBUG_LOG(m_logger) << "claimPlannedCharge for id : " << m_data.chargeTypeId << ", count: " << count;
|
||||
|
||||
// Works both directions, can "claim" negative count!
|
||||
if (m_data.amount - m_data.planned < count)
|
||||
@@ -81,11 +81,11 @@ Core::FunctionReplyObject ObjectChargeAdministration::consumeCharge(int count, b
|
||||
if (m_data.planned < count)
|
||||
{
|
||||
// consume what is possible
|
||||
WARNING_LOG() << "Cannot consume " << count << ", consuming instead " << m_data.planned << " planned";
|
||||
WARNING_LOG(m_logger) << "Cannot consume " << count << ", consuming instead " << m_data.planned << " planned";
|
||||
count = m_data.planned;
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "consumeCharge for id : " << m_data.chargeTypeId << ", count: " << count;
|
||||
DEBUG_LOG(m_logger) << "consumeCharge for id : " << m_data.chargeTypeId << ", count: " << count;
|
||||
|
||||
if (wasPlanned && m_data.planned < count)
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Wanted to consume %1 planned charges, but only %2 had been planned.")).arg(count).arg(m_data.planned);
|
||||
|
||||
Reference in new issue
Block a user