Skip to content
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.

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

IS-12: Ensure NcMethodResultError returned on error (not NcMethodResult) #415

Merged
merged 1 commit into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 2 deletions Development/nmos/control_protocol_methods.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
// unknown property
utility::stringstream_t ss;
ss << U("unknown property: ") << property_id.serialize() << U(" to do Get");
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();

Check warning on line 33 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 33 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 33 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 33 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 33 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 33 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'
return details::make_nc_method_result_error({ nc_method_status::property_not_implemented }, ss.str());
}

Expand All @@ -51,14 +51,20 @@
{
if (nmos::fields::nc::is_read_only(property))
{
return details::make_nc_method_result({ nc_method_status::read_only });
utility::stringstream_t ss;
ss << U("can not set read only property: ") << property_id.serialize();
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();

Check warning on line 56 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 56 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 56 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 56 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 56 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 56 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'
return details::make_nc_method_result_error({ nc_method_status::read_only }, ss.str());
}

if ((val.is_null() && !nmos::fields::nc::is_nullable(property))
|| (!val.is_array() && nmos::fields::nc::is_sequence(property))
|| (val.is_array() && !nmos::fields::nc::is_sequence(property)))
{
return details::make_nc_method_result({ nc_method_status::parameter_error });
utility::stringstream_t ss;
ss << U("parameter error: can not set value: ") << val.serialize() << U(" on property: ") << property_id.serialize();
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();

Check warning on line 66 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 66 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 66 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 66 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 66 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 66 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'
return details::make_nc_method_result_error({ nc_method_status::parameter_error }, ss.str());
}

try
Expand All @@ -85,7 +91,7 @@
{
utility::stringstream_t ss;
ss << "Set property: " << property_id.serialize() << " value: " << val.serialize() << " error: " << e.what();
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();

Check warning on line 94 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 94 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 94 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 94 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 94 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 94 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'
return details::make_nc_method_result_error({ nc_method_status::parameter_error }, ss.str());
}
}
Expand All @@ -93,7 +99,7 @@
// unknown property
utility::stringstream_t ss;
ss << U("unknown property: ") << property_id.serialize() << " to do Set";
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();

Check warning on line 102 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 102 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 102 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 102 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 102 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 102 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'
return details::make_nc_method_result_error({ nc_method_status::property_not_implemented }, ss.str());
}

Expand Down Expand Up @@ -129,14 +135,14 @@
// out of bound
utility::stringstream_t ss;
ss << U("property: ") << property_id.serialize() << U(" is outside the available range to do GetSequenceItem");
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();

Check warning on line 138 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 138 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 138 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 138 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 138 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 138 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'
return details::make_nc_method_result_error({ nc_method_status::index_out_of_bounds }, ss.str());
}

// unknown property
utility::stringstream_t ss;
ss << U("unknown property: ") << property_id.serialize() << U(" to do GetSequenceItem");
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();

Check warning on line 145 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 145 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 145 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 145 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 145 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 145 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'
return details::make_nc_method_result_error({ nc_method_status::property_not_implemented }, ss.str());
}

Expand Down Expand Up @@ -168,7 +174,7 @@
// property is not a sequence
utility::stringstream_t ss;
ss << U("property: ") << property_id.serialize() << U(" is not a sequence to do SetSequenceItem");
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();

Check warning on line 177 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 177 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 177 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 177 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 177 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 177 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'
return details::make_nc_method_result_error({ nc_method_status::invalid_request }, ss.str());
}

Expand Down Expand Up @@ -198,7 +204,7 @@
{
utility::stringstream_t ss;
ss << "Set sequence item: " << property_id.serialize() << " index: " << index << " value: " << val.serialize() << " error: " << e.what();
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();

Check warning on line 207 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 207 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 207 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 207 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 207 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 207 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'
return details::make_nc_method_result_error({ nc_method_status::parameter_error }, ss.str());
}
}
Expand All @@ -206,7 +212,7 @@
// out of bound
utility::stringstream_t ss;
ss << U("property: ") << property_id.serialize() << U(" is outside the available range to do SetSequenceItem");
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();

Check warning on line 215 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 215 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: false)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 215 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 215 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2019: build and test (install mdns: false, use conan: true, force cpprest asio: false, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 215 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'

Check warning on line 215 in Development/nmos/control_protocol_methods.cpp

View workflow job for this annotation

GitHub Actions / windows-2022: build and test (install mdns: false, use conan: true, force cpprest asio: true, dns-sd mode: multicast, enable_authorization: true)

nonstandard extension used: 'argument': conversion from 'slog::detail::`anonymous-namespace'::log<slog::base_gate,20>' to 'slog::log_statement &'
return details::make_nc_method_result_error({ nc_method_status::index_out_of_bounds }, ss.str());
}

Expand Down
8 changes: 6 additions & 2 deletions Development/nmos/control_protocol_ws_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,10 @@ namespace nmos
catch (const nmos::control_protocol_exception& e)
{
// invalid arguments
slog::log<slog::severities::error>(gate, SLOG_FLF) << "invalid argument: " << arguments.serialize() << " error: " << e.what();
nc_method_result = details::make_nc_method_result({ nmos::nc_method_status::parameter_error });
utility::stringstream_t ss;
ss << "invalid argument: " << arguments.serialize() << " error: " << e.what();
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();
nc_method_result = details::make_nc_method_result_error({ nmos::nc_method_status::parameter_error }, ss.str());
}
}
else
Expand All @@ -287,6 +289,7 @@ namespace nmos
utility::stringstream_t ss;
ss << U("unsupported method_id: ") << nmos::fields::nc::method_id(cmd).serialize()
<< U(" for control class class_id: ") << resource->data.at(nmos::fields::nc::class_id).serialize();
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();
nc_method_result = details::make_nc_method_result_error({ nc_method_status::method_not_implemented }, ss.str());
}
}
Expand All @@ -295,6 +298,7 @@ namespace nmos
// resource not found for the given oid
utility::stringstream_t ss;
ss << U("unknown oid: ") << oid;
slog::log<slog::severities::error>(gate, SLOG_FLF) << ss.str();
nc_method_result = details::make_nc_method_result_error({ nc_method_status::bad_oid }, ss.str());
}
// accumulating up response
Expand Down
Loading