aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2021-02-15 21:50:34 -0500
committerluigi1111 <luigi1111w@gmail.com>2021-02-15 21:50:34 -0500
commitbf53f55366cbc22fa566fa5d5a9a768e193e17d3 (patch)
treeb68ba0c5a42fb28b8868aeaa5276a1010a153ae4
parentMerge pull request #7275 (diff)
parentwallet_rpc_server: don't abort on initial refresh failure (diff)
downloadmonero-bf53f55366cbc22fa566fa5d5a9a768e193e17d3.tar.xz
Merge pull request #7288
015da03 wallet_rpc_server: don't abort on initial refresh failure (xiphon)
-rw-r--r--src/wallet/wallet_rpc_server.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 03db8b70f..13de73f8c 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -4438,7 +4438,14 @@ public:
wal->stop();
});
- wal->refresh(wal->is_trusted_daemon());
+ try
+ {
+ wal->refresh(wal->is_trusted_daemon());
+ }
+ catch (const std::exception& e)
+ {
+ LOG_ERROR(tools::wallet_rpc_server::tr("Initial refresh failed: ") << e.what());
+ }
// if we ^C during potentially length load/refresh, there's no server loop yet
if (quit)
{