From 20babd9bfaf0ee78c462ab8a28eb67660d858b94 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Mon, 4 Jan 2021 15:52:22 +0100 Subject: fix(inspector): kill child process after test (#8986) The child process kept running and printing "hello" to stdout. This commit also removes the dependency on reqwest and instead switches to the re-export from the fetch crate. Brings back commit 1a2e7741c33490d2a91147966019853c6b1d6a48. --- runtime/inspector.rs | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'runtime') diff --git a/runtime/inspector.rs b/runtime/inspector.rs index 58df05c54..befaaebee 100644 --- a/runtime/inspector.rs +++ b/runtime/inspector.rs @@ -182,20 +182,21 @@ fn handle_ws_request( .status(http::StatusCode::BAD_REQUEST) .body("Not a valid Websocket Request".into()), }); - tokio::task::spawn_local(async move { - let upgraded = body.on_upgrade().await.unwrap(); - let websocket = tokio_tungstenite::WebSocketStream::from_raw_socket( - upgraded, - tungstenite::protocol::Role::Server, - None, - ) - .await; - let (proxy, pump) = create_websocket_proxy(websocket); - - let _ = new_websocket_tx.unbounded_send(proxy); - pump.await; - }); + if resp.is_ok() { + tokio::task::spawn_local(async move { + let upgraded = body.on_upgrade().await.unwrap(); + let websocket = tokio_tungstenite::WebSocketStream::from_raw_socket( + upgraded, + tungstenite::protocol::Role::Server, + None, + ) + .await; + let (proxy, pump) = create_websocket_proxy(websocket); + let _ = new_websocket_tx.unbounded_send(proxy); + pump.await; + }); + } resp } else { http::Response::builder() @@ -275,11 +276,14 @@ async fn server( (&http::Method::GET, path) if path.starts_with("/ws/") => { handle_ws_request(req, inspector_map.clone()) } + (&http::Method::GET, "/json/version") => { + handle_json_version_request(json_version_response.clone()) + } (&http::Method::GET, "/json") => { handle_json_request(inspector_map.clone()) } - (&http::Method::GET, "/json/version") => { - handle_json_version_request(json_version_response.clone()) + (&http::Method::GET, "/json/list") => { + handle_json_request(inspector_map.clone()) } _ => http::Response::builder() .status(http::StatusCode::NOT_FOUND) -- cgit v1.2.3