aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2021-02-18 13:34:18 +0100
committerMarcoFalke <falke.marco@gmail.com>2021-02-18 15:08:35 +0100
commitfaf48f20f196e418b2eea390a0140db3604cfa15 (patch)
tree8353e897c780c479d72cd409550826f9da0cde18 /src
parentdb656db2ed5aecc6e623fd3ef1e1bb34207b9e57 (diff)
downloadbitcoin-faf48f20f196e418b2eea390a0140db3604cfa15.tar.xz
log: Clarify log message when file does not exist
Also, run clang-format on the function
Diffstat (limited to 'src')
-rw-r--r--src/addrdb.cpp12
-rw-r--r--src/banman.cpp2
-rw-r--r--src/net.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/addrdb.cpp b/src/addrdb.cpp
index 8f77ed35ce..0922c1c432 100644
--- a/src/addrdb.cpp
+++ b/src/addrdb.cpp
@@ -109,15 +109,15 @@ template <typename Data>
bool DeserializeFileDB(const fs::path& path, Data& data)
{
// open input file, and associate with CAutoFile
- FILE *file = fsbridge::fopen(path, "rb");
+ FILE* file = fsbridge::fopen(path, "rb");
CAutoFile filein(file, SER_DISK, CLIENT_VERSION);
- if (filein.IsNull())
- return error("%s: Failed to open file %s", __func__, path.string());
-
+ if (filein.IsNull()) {
+ LogPrintf("Missing or invalid file %s\n", path.string());
+ return false;
+ }
return DeserializeDB(filein, data);
}
-
-}
+} // namespace
CBanDB::CBanDB(fs::path ban_list_path) : m_ban_list_path(std::move(ban_list_path))
{
diff --git a/src/banman.cpp b/src/banman.cpp
index 49bf6c43dc..3fe561ad01 100644
--- a/src/banman.cpp
+++ b/src/banman.cpp
@@ -28,7 +28,7 @@ BanMan::BanMan(fs::path ban_file, CClientUIInterface* client_interface, int64_t
LogPrint(BCLog::NET, "Loaded %d banned node ips/subnets from banlist.dat %dms\n",
m_banned.size(), GetTimeMillis() - n_start);
} else {
- LogPrintf("Invalid or missing banlist.dat; recreating\n");
+ LogPrintf("Recreating banlist.dat\n");
SetBannedSetDirty(true); // force write
DumpBanlist();
}
diff --git a/src/net.cpp b/src/net.cpp
index 81176785a2..fc503e974c 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2391,7 +2391,7 @@ bool CConnman::Start(CScheduler& scheduler, const Options& connOptions)
LogPrintf("Loaded %i addresses from peers.dat %dms\n", addrman.size(), GetTimeMillis() - nStart);
else {
addrman.Clear(); // Addrman can be in an inconsistent state after failure, reset it
- LogPrintf("Invalid or missing peers.dat; recreating\n");
+ LogPrintf("Recreating peers.dat\n");
DumpAddresses();
}
}