Skip to content

refs #1210 Forward result of NorthService::sendToDispatcher() to the … #1211

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
MarkRiddoch merged 5 commits into from
Jan 9, 2024
Merged

refs #1210 Forward result of NorthService::sendToDispatcher() to the … #1211

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae9f3ab
refs #1210 Forward result of NorthService::sendToDispatcher() to the …
Oct 24, 2023
b6dc77b
Merge branch 'develop' into 1210-return-value-of-operations-not-forwa…
MarkRiddoch Nov 30, 2023
253b4b8
Merge branch 'develop' into 1210-return-value-of-operations-not-forwa…
MarkRiddoch Dec 22, 2023
a7d6e74
Merge branch 'develop' into 1210-return-value-of-operations-not-forwa…
MarkRiddoch Dec 22, 2023
5caae74
Merge branch 'develop' into 1210-return-value-of-operations-not-forwa…
MarkRiddoch Jan 8, 2024
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
10 changes: 6 additions & 4 deletions C/services/north/north.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,6 +932,7 @@ void NorthService::addConfigDefaults(DefaultConfigCategory& defaultConfig)
* @param name Name of the variable to write
* @param value Value to write to the variable
* @param destination Where to write the value
* @return true if write was succesfully sent to dispatcher, else false
*/
bool NorthService::write(const string& name, const string& value, const ControlDestination destination)
{
Expand Down Expand Up @@ -961,6 +962,7 @@ bool NorthService::write(const string& name, const string& value, const ControlD
* @param value Value to write to the variable
* @param destination Where to write the value
* @param arg Argument used to determine destination
* @return true if write was succesfully sent to dispatcher, else false
*/
bool NorthService::write(const string& name, const string& value, const ControlDestination destination, const string& arg)
{
Expand Down Expand Up @@ -1008,6 +1010,7 @@ bool NorthService::write(const string& name, const string& value, const ControlD
* @param paramCount The number of parameters
* @param parameters The parameters to the operation
* @param destination Where to write the value
* @return -1 in case of error on operation destination, 1 if operation was succesfully sent to dispatcher, else 0
*/
int NorthService::operation(const string& name, int paramCount, char *names[], char *parameters[], const ControlDestination destination)
{
Expand Down Expand Up @@ -1039,8 +1042,7 @@ int NorthService::operation(const string& name, int paramCount, char *names[],
payload += ",";
}
payload += " } } }";
sendToDispatcher("/dispatch/operation", payload);
return -1;
return static_cast<int>(sendToDispatcher("/dispatch/operation", payload));
}

/**
Expand All @@ -1051,6 +1053,7 @@ int NorthService::operation(const string& name, int paramCount, char *names[],
* @param parameters The parameters to the operation
* @param destination Where to write the value
* @param arg Argument used to determine destination
* @return 1 if operation was succesfully sent to dispatcher, else 0
*/
int NorthService::operation(const string& name, int paramCount, char *names[], char *parameters[], const ControlDestination destination, const string& arg)
{
Expand Down Expand Up @@ -1099,8 +1102,7 @@ int NorthService::operation(const string& name, int paramCount, char *names[], c
payload += ",";
}
payload += "} } }";
sendToDispatcher("/dispatch/operation", payload);
return -1;
return static_cast<int>(sendToDispatcher("/dispatch/operation", payload));
}

/**
Expand Down