Skip to content

Commit 6450abc

Browse files
c-jimenezc-jimenez
committed
[chargepoint] Code formatting on maintenance, metervlues and triggermessage managers
1 parent 867be98 commit 6450abc

File tree

3 files changed

+52
-29
lines changed

3 files changed

+52
-29
lines changed

‎src/chargepoint/maintenance/MaintenanceManager.cpp‎

Lines changed: 44 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -589,9 +589,16 @@ void MaintenanceManager::processGetDiagnostics(std::string
589589
if (nb_retries > 0)
590590
{
591591
nb_retries--;
592-
LOG_WARNING << "GetDiagnostics : upload failed (" << nb_retries << " retrie(s) left - next retry in "
593-
<< retry_interval_s.count() << "s)";
594-
std::this_thread::sleep_for(retry_interval_s);
592+
if (nb_retries != 0)
593+
{
594+
LOG_WARNING << "GetDiagnostics : upload failed (" << nb_retries << " retrie(s) left - next retry in "
595+
<< retry_interval_s.count() << "s)";
596+
std::this_thread::sleep_for(retry_interval_s);
597+
}
598+
else
599+
{
600+
LOG_WARNING << "GetDiagnostics : upload failed no retries left";
601+
}
595602
}
596603
}
597604

@@ -636,7 +643,7 @@ void MaintenanceManager::processUpdateFirmware(std::string
636643
ocpp::types::DateTime retrieve_date)
637644
{
638645

639-
LOG_INFO << "UpdateFirmware : Waiting until retrieve date:"<<retrieve_date.timestamp()<<" DateTime::now():"<<DateTime::now();
646+
LOG_INFO << "UpdateFirmware : Waiting until retrieve date (" << retrieve_date.timestamp() << ") from now (" << DateTime::now() << ")";
640647

641648
// Check retrieve date
642649
if (retrieve_date > DateTime::now())
@@ -669,13 +676,19 @@ void MaintenanceManager::processUpdateFirmware(std::string
669676
if (!success)
670677
{
671678
// Next retry
672-
673679
if (nb_retries > 0)
674680
{
675-
nb_retries--;
676-
LOG_WARNING << "FirmwareUpdate : download failed (" << nb_retries << " retrie(s) left - next retry in "
677-
<< retry_interval_s.count() << "s)";
678-
std::this_thread::sleep_for(retry_interval_s);
681+
nb_retries--;
682+
if (nb_retries != 0)
683+
{
684+
LOG_WARNING << "FirmwareUpdate : download failed (" << nb_retries << " retrie(s) left - next retry in "
685+
<< retry_interval_s.count() << "s)";
686+
std::this_thread::sleep_for(retry_interval_s);
687+
}
688+
else
689+
{
690+
LOG_WARNING << "FirmwareUpdate : download failed no retries left";
691+
}
679692
}
680693
}
681694

@@ -769,13 +782,20 @@ void MaintenanceManager::processGetLog(ocpp::types::LogEnumType type,
769782
success = m_events_handler.uploadFile(local_log_file, url);
770783
if (!success)
771784
{
772-
// Next retry
785+
// Next retry
773786
if (nb_retries > 0)
774787
{
775788
nb_retries--;
776-
LOG_WARNING << "GetLog : upload failed (" << nb_retries << " retrie(s) left - next retry in " << retry_interval_s.count()
777-
<< "s)";
778-
std::this_thread::sleep_for(retry_interval_s);
789+
if (nb_retries != 0)
790+
{
791+
LOG_WARNING << "GetLog : upload failed (" << nb_retries << " retrie(s) left - next retry in "
792+
<< retry_interval_s.count() << "s)";
793+
std::this_thread::sleep_for(retry_interval_s);
794+
}
795+
else
796+
{
797+
LOG_WARNING << "GetLog : upload failed retries left";
798+
}
779799
}
780800
}
781801

@@ -857,13 +877,20 @@ void MaintenanceManager::processSignedUpdateFirmware(std::string
857877
success = m_events_handler.downloadFile(location, local_firmware_file);
858878
if (!success)
859879
{
860-
// Next retry
880+
// Next retry
861881
if (nb_retries > 0)
862882
{
863883
nb_retries--;
864-
LOG_WARNING << "SignedUpdateFirmware : download failed (" << nb_retries << " retrie(s) left - next retry in "
865-
<< retry_interval_s.count() << "s)";
866-
std::this_thread::sleep_for(retry_interval_s);
884+
if (nb_retries != 0)
885+
{
886+
LOG_WARNING << "SignedUpdateFirmware : download failed (" << nb_retries << " retrie(s) left - next retry in "
887+
<< retry_interval_s.count() << "s)";
888+
std::this_thread::sleep_for(retry_interval_s);
889+
}
890+
else
891+
{
892+
LOG_WARNING << "SignedUpdateFirmware : download failed no retries left";
893+
}
867894
}
868895
}
869896

‎src/chargepoint/metervalues/MeterValuesManager.cpp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,11 @@ void MeterValuesManager::getTxStopMeterValues(unsigned int connector_id, std::ve
188188
bool MeterValuesManager::onTriggerMessage(ocpp::types::MessageTrigger message, const ocpp::types::Optional<unsigned int>& connector_id)
189189
{
190190
bool ret = false;
191-
192191
if (message == MessageTrigger::MeterValues)
193192
{
194193
if (connector_id.isSet())
195194
{
196195
processTriggered(connector_id);
197-
ret = true;
198196
}
199197
else
200198
{
@@ -203,8 +201,8 @@ bool MeterValuesManager::onTriggerMessage(ocpp::types::MessageTrigger message, c
203201
unsigned int id = connector->id;
204202
processTriggered(id);
205203
}
206-
ret = true;
207204
}
205+
ret = true;
208206
}
209207
return ret;
210208
}
@@ -219,7 +217,6 @@ bool MeterValuesManager::onTriggerMessage(ocpp::types::MessageTriggerEnumType
219217
if (connector_id.isSet())
220218
{
221219
processTriggered(connector_id);
222-
ret = true;
223220
}
224221
else
225222
{
@@ -228,11 +225,10 @@ bool MeterValuesManager::onTriggerMessage(ocpp::types::MessageTriggerEnumType
228225
unsigned int id = connector->id;
229226
processTriggered(id);
230227
}
231-
ret = true;
232228
}
229+
ret = true;
233230
}
234231
return ret;
235-
236232
}
237233

238234
/** @copydoc void IConfigChangedListener::configurationValueChanged(const std::string&) */

‎src/chargepoint/trigger/TriggerMessageManager.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ bool TriggerMessageManager::handleMessage(const ocpp::messages::TriggerMessageRe
8888
// Check invalid connector id
8989
if (request.connectorId.isSet() && !m_connectors.isValid(request.connectorId))
9090
{
91-
error_code = ocpp::rpc::IRpc::RPC_ERROR_PROPERTY_CONSTRAINT_VIOLATION;
92-
error_message = "Invalid connector id";
91+
error_code = ocpp::rpc::IRpc::RPC_ERROR_PROPERTY_CONSTRAINT_VIOLATION;
92+
error_message = "Invalid connector id";
9393
response.status = TriggerMessageStatus::Rejected;
9494
}
9595
else
@@ -140,8 +140,8 @@ bool TriggerMessageManager::handleMessage(const ocpp::messages::ExtendedTriggerM
140140
// Check invalid connector id
141141
if (request.connectorId.isSet() && !m_connectors.isValid(request.connectorId))
142142
{
143-
error_code = ocpp::rpc::IRpc::RPC_ERROR_PROPERTY_CONSTRAINT_VIOLATION;
144-
error_message = "Invalid connector id";
143+
error_code = ocpp::rpc::IRpc::RPC_ERROR_PROPERTY_CONSTRAINT_VIOLATION;
144+
error_message = "Invalid connector id";
145145
response.status = TriggerMessageStatusEnumType::Rejected;
146146
}
147147
else
@@ -150,12 +150,12 @@ bool TriggerMessageManager::handleMessage(const ocpp::messages::ExtendedTriggerM
150150
if (it->second->onTriggerMessage(request.requestedMessage, request.connectorId))
151151
{
152152
response.status = TriggerMessageStatusEnumType::Accepted;
153-
LOG_INFO << "Trigger message accepted : " << trigger_message;
153+
LOG_INFO << "Extended trigger message accepted : " << trigger_message;
154154
}
155155
else
156156
{
157157
response.status = TriggerMessageStatusEnumType::Rejected;
158-
LOG_WARNING << "Trigger message rejected : " << trigger_message;
158+
LOG_WARNING << "Extended trigger message rejected : " << trigger_message;
159159
}
160160
}
161161
}

0 commit comments

Comments
 (0)