Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scord
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eu
ADMIRE
scord
Commits
5fedbe20
Verified
Commit
5fedbe20
authored
1 year ago
by
Alberto Miranda
♨️
Browse files
Options
Downloads
Patches
Plain Diff
scord-ctl: Put RPC handlers in correct namespace
parent
a027efbe
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!92
Resolve "Adhoc storage deployment needs to be executed by `scord-ctl` instead of `scord`"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/scord-ctl/rpc_handlers.cpp
+2
-2
2 additions, 2 deletions
src/scord-ctl/rpc_handlers.cpp
src/scord-ctl/rpc_handlers.hpp
+2
-2
2 additions, 2 deletions
src/scord-ctl/rpc_handlers.hpp
src/scord-ctl/scord-ctl.cpp
+2
-1
2 additions, 1 deletion
src/scord-ctl/scord-ctl.cpp
with
6 additions
and
5 deletions
src/scord-ctl/rpc_handlers.cpp
+
2
−
2
View file @
5fedbe20
...
...
@@ -34,7 +34,7 @@ struct remote_procedure {
}
};
namespace
scord
::
network
::
handlers
{
namespace
scord
_ctl
::
network
::
handlers
{
void
ping
(
const
scord
::
network
::
request
&
req
)
{
...
...
@@ -59,4 +59,4 @@ ping(const scord::network::request& req) {
req
.
respond
(
resp
);
}
}
// namespace scord::network::handlers
}
// namespace scord
_ctl
::network::handlers
This diff is collapsed.
Click to expand it.
src/scord-ctl/rpc_handlers.hpp
+
2
−
2
View file @
5fedbe20
...
...
@@ -29,11 +29,11 @@
#include
<net/serialization.hpp>
#include
<scord/types.hpp>
namespace
scord
::
network
::
handlers
{
namespace
scord
_ctl
::
network
::
handlers
{
void
ping
(
const
scord
::
network
::
request
&
req
);
}
// namespace scord::network::handlers
}
// namespace scord
_ctl
::network::handlers
#endif // SCORD_CTL_RPC_HANDLERS_HPP
This diff is collapsed.
Click to expand it.
src/scord-ctl/scord-ctl.cpp
+
2
−
1
View file @
5fedbe20
...
...
@@ -85,7 +85,8 @@ main(int argc, char* argv[]) {
// convenience macro to ensure the names of an RPC and its handler
// always match
#define EXPAND(rpc_name) "ADM_" #rpc_name##s, scord::network::handlers::rpc_name
#define EXPAND(rpc_name) \
"ADM_" #rpc_name##s, scord_ctl::network::handlers::rpc_name
srv
.
set_handler
(
EXPAND
(
ping
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment