Skip to content

[chargepoint] Fix stop process #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2023
Merged

[chargepoint] Fix stop process #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/chargepoint/ChargePoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,9 @@ bool ChargePoint::stop()
m_uptime_timer.stop();
saveUptime();

// Stop connection
ret = m_rpc_client->stop();

// Stop managers
m_config_manager.reset();
m_authent_manager.reset();
Expand All @@ -379,9 +382,6 @@ bool ChargePoint::stop()
m_requests_fifo_manager.reset();
m_iso15118_manager.reset();

// Stop connection
ret = m_rpc_client->stop();

// Stop security manager
m_security_manager.stop();

Expand Down Expand Up @@ -935,10 +935,14 @@ void ChargePoint::rpcClientFailed()
/** @copydoc void IRpc::IListener::rpcDisconnected() */
void ChargePoint::rpcDisconnected()
{
LOG_ERROR << "Connection lost with Central System";
m_status_manager->updateConnectionStatus(false);
m_requests_fifo_manager->updateConnectionStatus(false);
m_events_handler.connectionStateChanged(false);
// Check if stop is in progress
if (m_uptime_timer.isStarted())
{
LOG_ERROR << "Connection lost with Central System";
m_status_manager->updateConnectionStatus(false);
m_requests_fifo_manager->updateConnectionStatus(false);
m_events_handler.connectionStateChanged(false);
}
}

/** @copydoc void IRpc::IListener::rpcError() */
Expand All @@ -958,7 +962,13 @@ bool ChargePoint::rpcCallReceived(const std::string& action,
std::string& error_code,
std::string& error_message)
{
return m_msg_dispatcher->dispatchMessage(action, payload, response, error_code, error_message);
bool ret = false;
// Check if stop is in progress
if (m_uptime_timer.isStarted())
{
ret = m_msg_dispatcher->dispatchMessage(action, payload, response, error_code, error_message);
}
return ret;
}

/** @copydoc void IRpc::ISpy::rcpMessageReceived(const std::string&) */
Expand Down