log: Clarify log message when file does not exist

MarcoFalke · MarcoFalke · commit faf48f20f196 · 2021-02-18T15:08:35.000+01:00
Also, run clang-format on the function
diff --git 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
@@ -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
@@ -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();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ BanMan::BanMan(fs::path ban_file, CClientUIInterface* client_interface, int64_t`
`28`	`28`	`LogPrint(BCLog::NET, "Loaded %d banned node ips/subnets from banlist.dat %dms\n",`
`29`	`29`	`m_banned.size(), GetTimeMillis() - n_start);`
`30`	`30`	`} else {`
`31`		`- LogPrintf("Invalid or missing banlist.dat; recreating\n");`
	`31`	`+ LogPrintf("Recreating banlist.dat\n");`
`32`	`32`	`SetBannedSetDirty(true); // force write`
`33`	`33`	`DumpBanlist();`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2391,7 +2391,7 @@ bool CConnman::Start(CScheduler& scheduler, const Options& connOptions)`
`2391`	`2391`	`LogPrintf("Loaded %i addresses from peers.dat %dms\n", addrman.size(), GetTimeMillis() - nStart);`
`2392`	`2392`	`else {`
`2393`	`2393`	`addrman.Clear(); // Addrman can be in an inconsistent state after failure, reset it`
`2394`		`- LogPrintf("Invalid or missing peers.dat; recreating\n");`
	`2394`	`+ LogPrintf("Recreating peers.dat\n");`
`2395`	`2395`	`DumpAddresses();`
`2396`	`2396`	`}`
`2397`	`2397`	`}`