From f38a31b3304726aa7c890ba1a9f7a3e67b11bc60 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 6 Sep 2023 17:49:30 +0200
Subject: block manager: avoid incorrect data_dir configs and avoid losing
 files

---
 src/block/manager.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/block/manager.rs')

diff --git a/src/block/manager.rs b/src/block/manager.rs
index b42a9aa9..eb498be0 100644
--- a/src/block/manager.rs
+++ b/src/block/manager.rs
@@ -279,16 +279,20 @@ impl BlockManager {
 					let res = match res {
 						Ok(res) => res,
 						Err(e) => {
-							debug!("Get block {:?}: node {:?} returned error: {}", hash, node, e);
+							debug!("Get block {:?}: node {:?} could not be contacted: {}", hash, node, e);
 							continue;
 						}
 					};
 					let (header, stream) = match res.into_parts() {
 						(Ok(BlockRpc::PutBlock { hash: _, header }), Some(stream)) => (header, stream),
-						_ => {
+						(Ok(_), _) => {
 							debug!("Get block {:?}: node {:?} returned a malformed response", hash, node);
 							continue;
 						}
+						(Err(e), _) => {
+							debug!("Get block {:?}: node {:?} returned error: {}", hash, node, e);
+							continue;
+						}
 					};
 					match f(header, stream).await {
 						Ok(ret) => return Ok(ret),
-- 
cgit v1.2.3