aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2021-01-16 16:05:54 +0100
committerAlex Auvolat <alex@adnab.me>2021-01-16 16:05:54 +0100
commit36814be447a9cdc4a1e6d39a9fe16ad335ab750a (patch)
tree5bdedc7b2ed0c5add2c14d7e9a1fbcfe30a3c0d3
parent6a5add33860349e2866de0e7ddae11375af825a2 (diff)
downloadgarage-0.1.1b.tar.gz
garage-0.1.1b.zip
Fix S3 ListObjects result and replace println!s by debug!s0.1.1b
-rwxr-xr-xscript/dev-cluster.sh2
-rw-r--r--src/api/api_server.rs4
-rw-r--r--src/api/s3_list.rs6
3 files changed, 6 insertions, 6 deletions
diff --git a/script/dev-cluster.sh b/script/dev-cluster.sh
index 64c17cfc..9da72909 100755
--- a/script/dev-cluster.sh
+++ b/script/dev-cluster.sh
@@ -10,7 +10,7 @@ PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH"
FANCYCOLORS=("41m" "42m" "44m" "45m" "100m" "104m")
export RUST_BACKTRACE=1
-export RUST_LOG=garage=info
+export RUST_LOG=garage=info,garage_api=debug
MAIN_LABEL="\e[${FANCYCOLORS[0]}[main]\e[49m"
WHICH_GARAGE=$(which garage || exit 1)
diff --git a/src/api/api_server.rs b/src/api/api_server.rs
index ec02572d..f0c3f31b 100644
--- a/src/api/api_server.rs
+++ b/src/api/api_server.rs
@@ -173,7 +173,7 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
&Method::PUT => {
// CreateBucket
// If we're here, the bucket already exists, so just answer ok
- println!(
+ debug!(
"Body: {}",
std::str::from_utf8(&hyper::body::to_bytes(req.into_body()).await?)
.unwrap_or("<invalid utf8>")
@@ -229,7 +229,7 @@ async fn handler_inner(garage: Arc<Garage>, req: Request<Body>) -> Result<Respon
// DeleteObjects
Ok(handle_delete_objects(garage, bucket, req).await?)
} else {
- println!(
+ debug!(
"Body: {}",
std::str::from_utf8(&hyper::body::to_bytes(req.into_body()).await?)
.unwrap_or("<invalid utf8>")
diff --git a/src/api/s3_list.rs b/src/api/s3_list.rs
index 599d0d11..07b87d3a 100644
--- a/src/api/s3_list.rs
+++ b/src/api/s3_list.rs
@@ -150,8 +150,8 @@ pub async fn handle_list(
writeln!(&mut xml, "\t</Contents>").unwrap();
}
if result_common_prefixes.len() > 0 {
- writeln!(&mut xml, "\t<CommonPrefixes>").unwrap();
for pfx in result_common_prefixes.iter() {
+ writeln!(&mut xml, "\t<CommonPrefixes>").unwrap();
writeln!(
&mut xml,
"\t\t<Prefix>{}</Prefix>",
@@ -159,11 +159,11 @@ pub async fn handle_list(
//xml_encode_key(pfx, urlencode_resp)
)
.unwrap();
+ writeln!(&mut xml, "\t</CommonPrefixes>").unwrap();
}
- writeln!(&mut xml, "\t</CommonPrefixes>").unwrap();
}
writeln!(&mut xml, "</ListBucketResult>").unwrap();
- println!("{}", xml);
+ debug!("{}", xml);
Ok(Response::new(Body::from(xml.into_bytes())))
}