aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin <quentin@deuxfleurs.fr>2020-11-10 15:32:04 +0100
committerQuentin <quentin@deuxfleurs.fr>2020-11-10 15:32:04 +0100
commit8797eed0abdefac9a550b7ef55f60ba5899a17bf (patch)
treed137b2bf9c99009516e154c13631e2ea53778a7d
parent1e52ee9f5b7532df79c16a9c6e71adbcceaed187 (diff)
downloadgarage-8797eed0abdefac9a550b7ef55f60ba5899a17bf.tar.gz
garage-8797eed0abdefac9a550b7ef55f60ba5899a17bf.zip
Fixes due to integration tests
-rw-r--r--config.dev.toml3
-rw-r--r--src/web/web_server.rs3
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<Body>| {
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")))
}