LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

wallet: Log and ignore errors in ListWalletDir and IsBerkeleyBtree

Browse source
This commit is contained in:
João Barbosa 2019-03-11 22:57:59 +00:00
parent 257f750cd9
commit 15c69b158d
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/wallet/walletutil.cpp
View file

@ -4,6 +4,7 @@
#include <wallet/walletutil.h> #include <wallet/walletutil.h>
#include <logging.h>
#include <util/system.h> #include <util/system.h>
fs::path GetWalletDir() fs::path GetWalletDir()
@ -33,7 +34,9 @@ static bool IsBerkeleyBtree(const fs::path& path)
// A Berkeley DB Btree file has at least 4K. // A Berkeley DB Btree file has at least 4K.
// This check also prevents opening lock files. // This check also prevents opening lock files.
boost::system::error_code ec; boost::system::error_code ec;
if (fs::file_size(path, ec) < 4096) return false; auto size = fs::file_size(path, ec);
if (ec) LogPrintf("%s: %s %s\n", __func__, ec.message(), path.string());
if (size < 4096) return false;
fsbridge::ifstream file(path, std::ios::binary); fsbridge::ifstream file(path, std::ios::binary);
if (!file.is_open()) return false; if (!file.is_open()) return false;
@ -54,8 +57,14 @@ std::vector<fs::path> ListWalletDir()
const fs::path wallet_dir = GetWalletDir(); const fs::path wallet_dir = GetWalletDir();
const size_t offset = wallet_dir.string().size() + 1; const size_t offset = wallet_dir.string().size() + 1;
std::vector<fs::path> paths; std::vector<fs::path> paths;
boost::system::error_code ec;
for (auto it = fs::recursive_directory_iterator(wallet_dir, ec); it != fs::recursive_directory_iterator(); it.increment(ec)) {
if (ec) {
LogPrintf("%s: %s %s\n", __func__, ec.message(), it->path().string());
continue;
}
for (auto it = fs::recursive_directory_iterator(wallet_dir); it != fs::recursive_directory_iterator(); ++it) {
// Get wallet path relative to walletdir by removing walletdir from the wallet path. // Get wallet path relative to walletdir by removing walletdir from the wallet path.
// This can be replaced by boost::filesystem::lexically_relative once boost is bumped to 1.60. // This can be replaced by boost::filesystem::lexically_relative once boost is bumped to 1.60.
const fs::path path = it->path().string().substr(offset); const fs::path path = it->path().string().substr(offset);