Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+13
-13
@@ -58,7 +58,7 @@ Core::FunctionReplyObject ObjectChargeEffect::create(const ChargeEffectModifyReq
|
||||
}
|
||||
|
||||
if (reply.error())
|
||||
ERROR_LOG() << reply.str();
|
||||
ERROR_LOG(m_logger) << reply.str();
|
||||
if (reply.id() == 0)
|
||||
reply.setId(m_data.id);
|
||||
return reply;
|
||||
@@ -96,7 +96,7 @@ Core::FunctionReplyObject ObjectChargeEffect::update(const ChargeEffectModifyReq
|
||||
}
|
||||
|
||||
if (reply.error())
|
||||
ERROR_LOG() << reply.str();
|
||||
ERROR_LOG(m_logger) << reply.str();
|
||||
|
||||
return reply;
|
||||
}
|
||||
@@ -111,13 +111,13 @@ Core::FunctionReplyObject ObjectChargeEffect::update(const ChargeEffectModifyReq
|
||||
void ObjectChargeEffect::updatedProperties(const Database::AesChargeEffect &dbData)
|
||||
{
|
||||
// update properties // "used": true/false
|
||||
DEBUG_LOG()<<" !!! update charge effect when not EsPrepared !!! ";
|
||||
DEBUG_LOG(m_logger)<<" !!! update charge effect when not EsPrepared !!! ";
|
||||
const QString tmpProps = m_data.properties;
|
||||
m_data.properties = dbData.properties; // update properties is allowed!!
|
||||
if (!m_mainHandler->db()->update(m_data))
|
||||
{
|
||||
m_data.properties = tmpProps;
|
||||
ERROR_LOG()<<" Couldn't update charge effect when not EsPrepared!!!";
|
||||
ERROR_LOG(m_logger)<<" Couldn't update charge effect when not EsPrepared!!!";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,14 +127,14 @@ bool ObjectChargeEffect::remove()
|
||||
{
|
||||
if (!m_mainHandler)
|
||||
{
|
||||
ERROR_LOG() << "Not possible to remove ChargeEffect --> No MainHandler present.";
|
||||
ERROR_LOG(m_logger) << "Not possible to remove ChargeEffect --> No MainHandler present.";
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->removeChargeEffectByKey(m_data.id))
|
||||
{
|
||||
ERROR_LOG() << "Not possible to remove ChargeEffect --> Could not remove from DDS.";
|
||||
ERROR_LOG(m_logger) << "Not possible to remove ChargeEffect --> Could not remove from DDS.";
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -198,14 +198,14 @@ void ObjectChargeEffect::publish()
|
||||
{
|
||||
if (!m_mainHandler)
|
||||
{
|
||||
ERROR_LOG() << QStringLiteral("Not possible to publish ChargeEffect --> Could not remove from DDS.");
|
||||
ERROR_LOG(m_logger) << QStringLiteral("Not possible to publish ChargeEffect --> Could not remove from DDS.");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->publish(dataBaseToDataTopic(m_data)))
|
||||
{
|
||||
ERROR_LOG() << QStringLiteral("Not possible to publish ChargeEffect --> DDS publish failed.");
|
||||
ERROR_LOG(m_logger) << QStringLiteral("Not possible to publish ChargeEffect --> DDS publish failed.");
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -295,7 +295,7 @@ void ObjectChargeEffect::setNextState()
|
||||
if (oldState != m_state)
|
||||
m_stateChanged = true;
|
||||
|
||||
DEBUG_LOG() << "Switching from " << oldState << "to " << m_state;
|
||||
DEBUG_LOG(m_logger) << "Switching from " << oldState << "to " << m_state;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -317,7 +317,7 @@ void ObjectChargeEffect::calculateInitEffectState()
|
||||
|
||||
if (oldState != m_state)
|
||||
m_stateChanged = true;
|
||||
DEBUG_LOG() << "Setting init state: " << m_state;
|
||||
DEBUG_LOG(m_logger) << "Setting init state: " << m_state;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -330,7 +330,7 @@ void ObjectChargeEffect::startStateTimer()
|
||||
{
|
||||
qint64 timeToActivatedMsecs = m_data.effectStart.toMSecsSinceEpoch() - QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
DEBUG_LOG() << "Time to Avtivated [ms]: " << timeToActivatedMsecs;
|
||||
DEBUG_LOG(m_logger) << "Time to Avtivated [ms]: " << timeToActivatedMsecs;
|
||||
|
||||
m_stateTimer->start(timeToActivatedMsecs);
|
||||
|
||||
@@ -340,7 +340,7 @@ void ObjectChargeEffect::startStateTimer()
|
||||
{
|
||||
qint64 timeToExpiredMsecs = m_data.effectStart.toMSecsSinceEpoch() + m_data.effectDuration - QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
DEBUG_LOG() << "Time to Expired [ms]: " << timeToExpiredMsecs;
|
||||
DEBUG_LOG(m_logger) << "Time to Expired [ms]: " << timeToExpiredMsecs;
|
||||
|
||||
m_stateTimer->start(timeToExpiredMsecs);
|
||||
|
||||
@@ -350,7 +350,7 @@ void ObjectChargeEffect::startStateTimer()
|
||||
{
|
||||
qint64 timeToFinishMsecs = m_data.effectStart.toMSecsSinceEpoch() + m_data.effectDuration + s_afterglowMsecs - QDateTime::currentMSecsSinceEpoch();
|
||||
|
||||
DEBUG_LOG() << "Time to finish/deletion [ms]: " << timeToFinishMsecs;
|
||||
DEBUG_LOG(m_logger) << "Time to finish/deletion [ms]: " << timeToFinishMsecs;
|
||||
|
||||
m_stateTimer->start(timeToFinishMsecs);
|
||||
|
||||
|
||||
Reference in new issue
Block a user