Skip to content

Commit 00da460

Browse files
Anton3apolukhin
andauthored
fix grpc: use grpc-client-common (#44)
Co-authored-by: Antony Polukhin <[email protected]>
1 parent 8c5dd48 commit 00da460

File tree

2 files changed

+34
-4
lines changed

2 files changed

+34
-4
lines changed

configs/static_config.yaml

+20-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
components_manager:
22
task_processors: # Task processor is an executor for coroutine tasks
33

4-
main-task-processor: # Make a task processor for CPU-bound couroutine tasks.
4+
main-task-processor: # Make a task processor for CPU-bound coroutine tasks.
55
worker_threads: $worker-threads # Process tasks in 4 threads.
66

77
fs-task-processor: # Make a separate task processor for filesystem bound tasks.
@@ -14,13 +14,21 @@ components_manager:
1414
default_task_processor: main-task-processor
1515

1616
components: # Configuring components that were registered via component_list
17-
grpc-client-factory:
17+
# Settings common to all gRPC client factories
18+
grpc-client-common:
1819
# The TaskProcessor for blocking connection initiation
19-
task-processor: grpc-blocking-task-processor
20+
blocking-task-processor: grpc-blocking-task-processor
2021

22+
grpc-client-factory:
2123
# Optional channel parameters for gRPC Core
2224
# https://grpc.github.io/grpc/core/group__grpc__arg__keys.html
2325
channel-args: {}
26+
middlewares:
27+
- grpc-client-logging
28+
- grpc-client-deadline-propagation
29+
30+
grpc-client-logging:
31+
grpc-client-deadline-propagation:
2432

2533
handler-hello:
2634

@@ -30,9 +38,17 @@ components_manager:
3038
grpc-server:
3139
port: 8081
3240
service-defaults:
33-
middlewares: []
41+
middlewares:
42+
- grpc-server-logging
43+
- grpc-server-deadline-propagation
44+
- grpc-server-congestion-control
3445
task-processor: main-task-processor
3546

47+
congestion-control:
48+
grpc-server-logging:
49+
grpc-server-deadline-propagation:
50+
grpc-server-congestion-control:
51+
3652
server:
3753
listener: # configuring the main listening socket...
3854
port: $server-port # ...to listen on this port and...

src/main.cpp

+14
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
#include <userver/clients/http/component.hpp>
22
#include <userver/components/minimal_server_component_list.hpp>
3+
#include <userver/congestion_control/component.hpp>
34
#include <userver/server/handlers/ping.hpp>
45
#include <userver/server/handlers/tests_control.hpp>
56
#include <userver/testsuite/testsuite_support.hpp>
67
#include <userver/ugrpc/client/client_factory_component.hpp>
8+
#include <userver/ugrpc/client/common_component.hpp>
9+
#include <userver/ugrpc/client/middlewares/deadline_propagation/component.hpp>
10+
#include <userver/ugrpc/client/middlewares/log/component.hpp>
11+
#include <userver/ugrpc/server/middlewares/congestion_control/component.hpp>
12+
#include <userver/ugrpc/server/middlewares/deadline_propagation/component.hpp>
13+
#include <userver/ugrpc/server/middlewares/log/component.hpp>
714
#include <userver/ugrpc/server/server_component.hpp>
815
#include <userver/utils/daemon_run.hpp>
916

@@ -13,8 +20,15 @@
1320
int main(int argc, char* argv[]) {
1421
auto component_list =
1522
userver::components::MinimalServerComponentList()
23+
.Append<userver::congestion_control::Component>()
1624
.Append<userver::ugrpc::server::ServerComponent>()
25+
.Append<userver::ugrpc::server::middlewares::congestion_control::Component>()
26+
.Append<userver::ugrpc::server::middlewares::deadline_propagation::Component>()
27+
.Append<userver::ugrpc::server::middlewares::log::Component>()
28+
.Append<userver::ugrpc::client::CommonComponent>()
1729
.Append<userver::ugrpc::client::ClientFactoryComponent>()
30+
.Append<userver::ugrpc::client::middlewares::deadline_propagation::Component>()
31+
.Append<userver::ugrpc::client::middlewares::log::Component>()
1832
.Append<userver::server::handlers::Ping>()
1933
.Append<userver::components::TestsuiteSupport>()
2034
.Append<userver::components::HttpClient>()

0 commit comments

Comments
 (0)