Skip to content

[localcontroller] Triggers a request timeout when a request cannot be forwarded to the Central System or to the Charge Point #105

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 3 commits into from
Jan 26, 2023
Merged

[localcontroller] Triggers a request timeout when a request cannot be forwarded to the Central System or to the Charge Point #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
132f6f5
[localcontroller] Triggers a request timeout when a request cannot be…
c-jimenez Jan 26, 2023
59ef4a0
[locallist] Fix local list message deserialization
c-jimenez Jan 26, 2023
231f6db
[vscode] Update launch and debug configuration
c-jimenez Jan 26, 2023
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
9 changes: 9 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@
"arguments": "-r",
"valuesFormatting": "parseText"
},
{
"type": "gdb",
"request": "launch",
"name": "x86 LC debug",
"target": "${workspaceRoot}/bin/gcc_native/quick_start_localcontroller",
"cwd": "${workspaceRoot}/bin/gcc_native/",
"arguments": "-r",
"valuesFormatting": "parseText"
},
{
"type": "gdb",
"request": "launch",
Expand Down
12 changes: 6 additions & 6 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"version": "2.0.0",
"tasks": [
{
"label": "build GCC native",
"label": "build GCC",
"type": "shell",
"command": "make",
"args": [
"gcc-native",
"gcc",
"BUILD_TYPE=Debug"
],
"problemMatcher": "$gcc",
Expand All @@ -18,20 +18,20 @@
}
},
{
"label": "tests GCC native",
"label": "tests GCC",
"type": "shell",
"command": "make",
"args": [
"tests-gcc-native"
"tests-gcc"
],
"group": "build"
},
{
"label": "clean GCC native",
"label": "clean GCC",
"type": "shell",
"command": "make",
"args": [
"clean-gcc-native",
"clean-gcc",
"BUILD_TYPE=Debug"
],
"group": "build"
Expand Down
2 changes: 0 additions & 2 deletions src/localcontroller/centralsystem/CentralSystemHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,6 @@ class CentralSystemHandler
if (cs_error.empty())
{
LOG_WARNING << "[" << m_identifier << "] - Unable to forward [" << action << "] request";
error = ocpp::rpc::IRpc::RPC_ERROR_INTERNAL;
}
else
{
Expand All @@ -428,7 +427,6 @@ class CentralSystemHandler
else
{
LOG_WARNING << "[" << m_identifier << "] - Unable to forward [" << action << "] request";
error = ocpp::rpc::IRpc::RPC_ERROR_INTERNAL;
}

return ret;
Expand Down
2 changes: 1 addition & 1 deletion src/localcontroller/centralsystem/CentralSystemProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ void CentralSystemProxy::rcpMessageReceived(const std::string& msg)
/** @copydoc void IRpc::ISpy::rcpMessageSent(const std::string& msg) */
void CentralSystemProxy::rcpMessageSent(const std::string& msg)
{
LOG_COM << "[" << m_identifier << "] - RX : " << msg;
LOG_COM << "[" << m_identifier << "] - TX : " << msg;
}

// RpcClient::IListener interface
Expand Down
1 change: 0 additions & 1 deletion src/localcontroller/chargepoint/ChargePointHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,6 @@ class ChargePointHandler
if (cs_error.empty())
{
LOG_WARNING << "[" << m_identifier << "] - Unable to forward [" << action << "] request";
error = ocpp::rpc::IRpc::RPC_ERROR_INTERNAL;
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/messages/SendLocalList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ bool SendLocalListReqConverter::fromJson(const rapidjson::Value& json,
{
bool ret = true;
extract(json, "listVersion", data.listVersion);
if (json.HasMember(""))
if (json.HasMember("localAuthorizationList"))
{
AuthorizationDataConverter authorization_data_converter;
std::vector<AuthorizationData>& local_authorization_list = data.localAuthorizationList;
Expand Down
5 changes: 2 additions & 3 deletions src/rpc/RpcBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,11 +415,10 @@ void RpcBase::rxThread()
else
{
// Error
if (error_code.empty())
if (!error_code.empty())
{
error_code = RPC_ERROR_GENERIC;
sendCallError(rpc_message->unique_id, error_code.c_str(), error);
}
sendCallError(rpc_message->unique_id, error_code.c_str(), error);
}

// Free resources
Expand Down