aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2021-03-15 18:40:27 +0100
committerAlex Auvolat <alex@adnab.me>2021-03-15 18:40:27 +0100
commit537f652fec479c7c5676bba14c23ea6634613122 (patch)
treec7e858c014849e7fe934826ec362e4d6cf3cbb11
parent0290afe1f8eafabf71695d677807e07658d078ab (diff)
downloadgarage-537f652fec479c7c5676bba14c23ea6634613122.tar.gz
garage-537f652fec479c7c5676bba14c23ea6634613122.zip
Tiny things
-rw-r--r--src/rpc/rpc_server.rs2
-rw-r--r--src/table/merkle.rs1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/rpc/rpc_server.rs b/src/rpc/rpc_server.rs
index 1c6bc8d2..4d14b790 100644
--- a/src/rpc/rpc_server.rs
+++ b/src/rpc/rpc_server.rs
@@ -51,7 +51,7 @@ where
trace!(
"Request message: {}",
- serde_json::to_string(&msg).unwrap_or("<json error>".into())
+ serde_json::to_string(&msg).unwrap_or("<json error>".into()).chars().take(100).collect::<String>()
);
match handler(msg, sockaddr).await {
diff --git a/src/table/merkle.rs b/src/table/merkle.rs
index a917a028..f60be8a8 100644
--- a/src/table/merkle.rs
+++ b/src/table/merkle.rs
@@ -56,6 +56,7 @@ pub struct MerkleNodeKey {
pub partition: MerklePartition,
// prefix: a prefix for the hash of full keys, i.e. hash(hash(partition_key)+sort_key)
+ #[serde(with = "serde_bytes")]
pub prefix: Vec<u8>,
}