File tree 4 files changed +27
-42
lines changed
4 files changed +27
-42
lines changed Original file line number Diff line number Diff line change @@ -256,7 +256,7 @@ where
256
256
let sender = sender. clone ( ) ;
257
257
let provider = provider. clone ( ) ;
258
258
let logger = logger. clone ( ) ;
259
-
259
+
260
260
// Blocking due to store interactions. Won't be blocking after #905.
261
261
graph:: spawn_blocking (
262
262
start_subgraph ( id, & * provider, logger)
Original file line number Diff line number Diff line change @@ -86,21 +86,14 @@ where
86
86
let store = self . store . clone ( ) ;
87
87
let node_id = self . node_id . clone ( ) ;
88
88
let new_service = make_service_fn ( move |_| {
89
- let logger_for_service = logger_for_service. clone ( ) ;
90
- let metrics = metrics. clone ( ) ;
91
- let graphql_runner = graphql_runner. clone ( ) ;
92
- let store = store. clone ( ) ;
93
- let node_id = node_id. clone ( ) ;
94
- async move {
95
- Result :: < _ , Error > :: Ok ( GraphQLService :: new (
96
- logger_for_service. clone ( ) ,
97
- metrics. clone ( ) ,
98
- graphql_runner. clone ( ) ,
99
- store. clone ( ) ,
100
- ws_port,
101
- node_id. clone ( ) ,
102
- ) )
103
- }
89
+ futures03:: future:: ok :: < _ , Error > ( GraphQLService :: new (
90
+ logger_for_service. clone ( ) ,
91
+ metrics. clone ( ) ,
92
+ graphql_runner. clone ( ) ,
93
+ store. clone ( ) ,
94
+ ws_port,
95
+ node_id. clone ( ) ,
96
+ ) )
104
97
} ) ;
105
98
106
99
// Create a task to run the server and handle HTTP requests
Original file line number Diff line number Diff line change @@ -81,18 +81,12 @@ where
81
81
let store = self . store . clone ( ) ;
82
82
let node_id = self . node_id . clone ( ) ;
83
83
let new_service = make_service_fn ( move |_| {
84
- let logger_for_service = logger_for_service. clone ( ) ;
85
- let graphql_runner = graphql_runner. clone ( ) ;
86
- let store = store. clone ( ) ;
87
- let node_id = node_id. clone ( ) ;
88
- async move {
89
- Result :: < _ , Error > :: Ok ( IndexNodeService :: new (
90
- logger_for_service. clone ( ) ,
91
- graphql_runner. clone ( ) ,
92
- store. clone ( ) ,
93
- node_id. clone ( ) ,
94
- ) )
95
- }
84
+ futures03:: future:: ok :: < _ , Error > ( IndexNodeService :: new (
85
+ logger_for_service. clone ( ) ,
86
+ graphql_runner. clone ( ) ,
87
+ store. clone ( ) ,
88
+ node_id. clone ( ) ,
89
+ ) )
96
90
} ) ;
97
91
98
92
// Create a task to run the server and handle HTTP requests
Original file line number Diff line number Diff line change @@ -63,22 +63,20 @@ impl MetricsServerTrait for PrometheusMetricsServer {
63
63
let server = self . clone ( ) ;
64
64
let new_service = make_service_fn ( move |_req| {
65
65
let server = server. clone ( ) ;
66
+ let registry = server. registry . clone ( ) ;
66
67
async move {
67
68
Ok :: < _ , Error > ( service_fn ( move |_| {
68
- let registry = server. registry . clone ( ) ;
69
- async move {
70
- let metric_families = registry. gather ( ) ;
71
- let mut buffer = vec ! [ ] ;
72
- let encoder = TextEncoder :: new ( ) ;
73
- encoder. encode ( & metric_families, & mut buffer) . unwrap ( ) ;
74
- Ok :: < _ , Error > (
75
- Response :: builder ( )
76
- . status ( 200 )
77
- . header ( hyper:: header:: CONTENT_TYPE , encoder. format_type ( ) )
78
- . body ( Body :: from ( buffer) )
79
- . unwrap ( ) ,
80
- )
81
- }
69
+ let metric_families = registry. gather ( ) ;
70
+ let mut buffer = vec ! [ ] ;
71
+ let encoder = TextEncoder :: new ( ) ;
72
+ encoder. encode ( & metric_families, & mut buffer) . unwrap ( ) ;
73
+ futures03:: future:: ok :: < _ , Error > (
74
+ Response :: builder ( )
75
+ . status ( 200 )
76
+ . header ( hyper:: header:: CONTENT_TYPE , encoder. format_type ( ) )
77
+ . body ( Body :: from ( buffer) )
78
+ . unwrap ( ) ,
79
+ )
82
80
} ) )
83
81
}
84
82
} ) ;
You can’t perform that action at this time.
0 commit comments