diff --git a/Cargo.lock b/Cargo.lock index bb4f2ce..20c6f7e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -207,21 +207,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - [[package]] name = "futures-channel" version = "0.3.30" @@ -229,7 +214,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", - "futures-sink", ] [[package]] @@ -238,34 +222,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "futures-sink" version = "0.3.30" @@ -284,16 +240,10 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ - "futures-channel", "futures-core", - "futures-io", - "futures-macro", - "futures-sink", "futures-task", - "memchr", "pin-project-lite", "pin-utils", - "slab", ] [[package]] @@ -691,7 +641,6 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" name = "pizzapicker" version = "0.1.0" dependencies = [ - "futures", "lazy_static", "rand", "reqwest", diff --git a/Cargo.toml b/Cargo.toml index 6f34a08..1ae07ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,4 +16,3 @@ tungstenite = { version = "0.21.0", features = ["handshake", "native-tls"]} uuid = { version = "1.7.0", features = ["v4", "serde"] } rand = "0.8.5" lazy_static = "1.4.0" -futures = "0.3.30" diff --git a/src/healthcheck.rs b/src/healthcheck.rs deleted file mode 100644 index a487bbf..0000000 --- a/src/healthcheck.rs +++ /dev/null @@ -1,23 +0,0 @@ -use std::net::SocketAddr; -use tokio::io::AsyncWriteExt; -use tokio::net::TcpListener; - -#[tracing::instrument] -pub async fn start_http_server() -> tokio::io::Result<()> { - tracing::info!("Starting HTTP server"); - let addr = SocketAddr::from(([0, 0, 0, 0], 3000)); - let listener = TcpListener::bind(addr).await?; - - loop { - let (mut socket, _) = listener.accept().await?; - tokio::spawn(async move { - match socket.peer_addr() { - Ok(peer_addr) => tracing::info!("Handling connection from {}", peer_addr), - Err(err) => tracing::info!("Handling connection from unknown peer {}", err), - } - let response = "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\nHealthcheck OK"; - let _ = socket.write_all(response.as_bytes()).await; - let _ = socket.shutdown().await; - }); - } -} diff --git a/src/main.rs b/src/main.rs index ae64b40..7f26511 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,6 @@ -use crate::healthcheck::start_http_server; use crate::slack::start_websocket_client; - -mod healthcheck; +use tracing_subscriber::layer::SubscriberExt; +use tracing_subscriber::util::SubscriberInitExt; mod roulette; mod slack; mod slack_message; @@ -12,13 +11,5 @@ async fn main() { .with_max_level(tracing::Level::INFO) .with_ansi(true) .init(); - let app_handle = tokio::spawn(async move { - start_websocket_client().await; - }); - let http_handle = tokio::spawn(async move { - start_http_server() - .await - .expect("Failed to start HTTP server"); - }); - futures::future::join_all(vec![app_handle, http_handle]).await; + start_websocket_client().await; }