File tree Expand file tree Collapse file tree 4 files changed +18
-9
lines changed Expand file tree Collapse file tree 4 files changed +18
-9
lines changed Original file line number Diff line number Diff line change 1
- use clap:: Parser ;
2
1
use apollo_mcp_proxy:: client:: start_proxy_client;
2
+ use clap:: Parser ;
3
3
use std:: error:: Error ;
4
4
use tracing_appender:: rolling:: { RollingFileAppender , Rotation } ;
5
5
use tracing_subscriber:: layer:: SubscriberExt ;
Original file line number Diff line number Diff line change @@ -262,7 +262,9 @@ impl ServerHandler for ProxyServer {
262
262
}
263
263
Err ( err) => {
264
264
error ! ( "[Proxy] Error calling tool: {:?}" , err) ;
265
- Ok ( CallToolResult :: error ( vec ! [ Content :: text( format!( "Error: {err}" ) ) ] ) )
265
+ Ok ( CallToolResult :: error ( vec ! [ Content :: text( format!(
266
+ "Error: {err}"
267
+ ) ) ] ) )
266
268
}
267
269
}
268
270
}
Original file line number Diff line number Diff line change 1
1
use std:: path:: PathBuf ;
2
2
3
+ use apollo_mcp_proxy:: client:: start_proxy_client;
3
4
use apollo_mcp_registry:: platform_api:: operation_collections:: collection_poller:: CollectionSource ;
4
5
use apollo_mcp_registry:: uplink:: persisted_queries:: ManifestSource ;
5
6
use apollo_mcp_registry:: uplink:: schema:: SchemaSource ;
@@ -10,11 +11,11 @@ use apollo_mcp_server::server::Server;
10
11
use clap:: Parser ;
11
12
use clap:: builder:: Styles ;
12
13
use clap:: builder:: styling:: { AnsiColor , Effects } ;
13
- use tokio:: signal;
14
14
use runtime:: IdOrDefault ;
15
15
use runtime:: logging:: Logging ;
16
16
use tracing:: { info, warn} ;
17
- use apollo_mcp_proxy:: client:: start_proxy_client;
17
+ use tokio:: signal;
18
+ use tracing_subscriber:: EnvFilter ;
18
19
19
20
mod runtime;
20
21
@@ -140,7 +141,12 @@ async fn main() -> anyhow::Result<()> {
140
141
. start ( ) ;
141
142
142
143
match config. transport {
143
- Transport :: StreamableHttp { proxy, proxy_url, address, port } => {
144
+ Transport :: StreamableHttp {
145
+ proxy,
146
+ proxy_url,
147
+ address,
148
+ port,
149
+ } => {
144
150
if proxy {
145
151
let url = Transport :: proxy_url ( & proxy_url, & address, & port) ;
146
152
let proxy_client = async {
@@ -157,7 +163,9 @@ async fn main() -> anyhow::Result<()> {
157
163
mcp_server. await ?;
158
164
}
159
165
}
160
- _ => { mcp_server. await ?; }
166
+ _ => {
167
+ mcp_server. await ?;
168
+ }
161
169
}
162
170
163
171
Ok ( ( ) )
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ use bon::bon;
5
5
use reqwest:: header:: { CONTENT_TYPE , HeaderMap , HeaderValue } ;
6
6
use schemars:: JsonSchema ;
7
7
use serde:: Deserialize ;
8
- use url:: { Url } ;
8
+ use url:: Url ;
9
9
10
10
use crate :: auth;
11
11
use crate :: custom_scalar_map:: CustomScalarMap ;
@@ -102,14 +102,13 @@ impl Transport {
102
102
103
103
pub fn proxy_url ( proxy_url : & Option < Url > , address : & IpAddr , port : & u16 ) -> Url {
104
104
match proxy_url {
105
- Some ( proxy_url) => { proxy_url. clone ( ) }
105
+ Some ( proxy_url) => proxy_url. clone ( ) ,
106
106
None => {
107
107
let address = format ! ( "http://{address}:{port}/mcp" ) ;
108
108
#[ allow( clippy:: unwrap_used) ]
109
109
Url :: parse ( address. as_str ( ) ) . unwrap ( )
110
110
}
111
111
}
112
-
113
112
}
114
113
}
115
114
You can’t perform that action at this time.
0 commit comments