From 8797eed0abdefac9a550b7ef55f60ba5899a17bf Mon Sep 17 00:00:00 2001 From: Quentin Date: Tue, 10 Nov 2020 15:32:04 +0100 Subject: [PATCH] Fixes due to integration tests --- config.dev.toml | 3 ++- src/web/web_server.rs | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.dev.toml b/config.dev.toml index 966bee4b..88378e50 100644 --- a/config.dev.toml +++ b/config.dev.toml @@ -17,4 +17,5 @@ api_bind_addr = "[::1]:3900" # the S3 API port, HTTP without TLS. Add a reverse s3_region = "garage" # set this to anything. S3 API calls will fail if they are not made against the region set here. [s3_web] -web_bind_addr = "[::1]:3902" +bind_addr = "[::1]:3902" +root_domain = ".garage.tld" diff --git a/src/web/web_server.rs b/src/web/web_server.rs index f38d8fd2..2c6185a1 100644 --- a/src/web/web_server.rs +++ b/src/web/web_server.rs @@ -20,7 +20,6 @@ pub async fn run_web_server( let service = make_service_fn(|conn: &AddrStream| { let garage = garage.clone(); let client_addr = conn.remote_addr(); - info!("{:?}", client_addr); async move { Ok::<_, Error>(service_fn(move |req: Request| { let garage = garage.clone(); @@ -58,7 +57,7 @@ async fn handler( let path = req.uri().path().to_string(); let key = percent_encoding::percent_decode_str(&path).decode_utf8()?; - info!("Selected bucket: {}, selected key: {}", bucket, key); + info!("Selected bucket: \"{}\", selected key: \"{}\"", bucket, key); Ok(Response::new(Body::from("hello world\n"))) }