Skip to content

Commit ae98bef

Browse files
committed
Add missing error logs for ReadFailed cases
.. some of the `ReadFailed` cases didn't log why they failed. Here we fix that oversight.
1 parent edff34c commit ae98bef

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

src/builder.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,6 +1138,7 @@ fn build_with_store_internal(
11381138
if e.kind() == std::io::ErrorKind::NotFound {
11391139
Arc::new(RwLock::new(NodeMetrics::default()))
11401140
} else {
1141+
log_error!(logger, "Failed to read node metrics from store: {}", e);
11411142
return Err(BuildError::ReadFailed);
11421143
}
11431144
},
@@ -1201,7 +1202,8 @@ fn build_with_store_internal(
12011202
Arc::clone(&kv_store),
12021203
Arc::clone(&logger),
12031204
)),
1204-
Err(_) => {
1205+
Err(e) => {
1206+
log_error!(logger, "Failed to read payment data from store: {}", e);
12051207
return Err(BuildError::ReadFailed);
12061208
},
12071209
};
@@ -1334,7 +1336,7 @@ fn build_with_store_internal(
13341336
if e.kind() == lightning::io::ErrorKind::NotFound {
13351337
Vec::new()
13361338
} else {
1337-
log_error!(logger, "Failed to read channel monitors: {}", e.to_string());
1339+
log_error!(logger, "Failed to read channel monitors from store: {}", e.to_string());
13381340
return Err(BuildError::ReadFailed);
13391341
}
13401342
},
@@ -1359,6 +1361,7 @@ fn build_with_store_internal(
13591361
if e.kind() == std::io::ErrorKind::NotFound {
13601362
Arc::new(Graph::new(config.network.into(), Arc::clone(&logger)))
13611363
} else {
1364+
log_error!(logger, "Failed to read network graph from store: {}", e);
13621365
return Err(BuildError::ReadFailed);
13631366
}
13641367
},
@@ -1379,6 +1382,7 @@ fn build_with_store_internal(
13791382
Arc::clone(&logger),
13801383
)))
13811384
} else {
1385+
log_error!(logger, "Failed to read scoring data from store: {}", e);
13821386
return Err(BuildError::ReadFailed);
13831387
}
13841388
},
@@ -1448,7 +1452,7 @@ fn build_with_store_internal(
14481452
);
14491453
let (_hash, channel_manager) =
14501454
<(BlockHash, ChannelManager)>::read(&mut reader, read_args).map_err(|e| {
1451-
log_error!(logger, "Failed to read channel manager from KVStore: {}", e);
1455+
log_error!(logger, "Failed to read channel manager from store: {}", e);
14521456
BuildError::ReadFailed
14531457
})?;
14541458
channel_manager
@@ -1677,6 +1681,7 @@ fn build_with_store_internal(
16771681
Arc::clone(&logger),
16781682
))
16791683
} else {
1684+
log_error!(logger, "Failed to read output sweeper data from store: {}", e);
16801685
return Err(BuildError::ReadFailed);
16811686
}
16821687
},
@@ -1689,6 +1694,7 @@ fn build_with_store_internal(
16891694
if e.kind() == std::io::ErrorKind::NotFound {
16901695
Arc::new(EventQueue::new(Arc::clone(&kv_store), Arc::clone(&logger)))
16911696
} else {
1697+
log_error!(logger, "Failed to read event queue from store: {}", e);
16921698
return Err(BuildError::ReadFailed);
16931699
}
16941700
},
@@ -1700,6 +1706,7 @@ fn build_with_store_internal(
17001706
if e.kind() == std::io::ErrorKind::NotFound {
17011707
Arc::new(PeerStore::new(Arc::clone(&kv_store), Arc::clone(&logger)))
17021708
} else {
1709+
log_error!(logger, "Failed to read peer data from store: {}", e);
17031710
return Err(BuildError::ReadFailed);
17041711
}
17051712
},

0 commit comments

Comments
 (0)