highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-25 05:52:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpc: Prefix rpcwaittimeout error with details on its nature

Browse Source 
As proposed by @laanwj the error message is now prefixed with the
"timeout on transient error:" prefix, to explain why the error is
suddenly considered terminal.
This commit is contained in:
Christian Decker
2021-03-23 14:39:25 +01:00
parent c490e17ef6
commit f76cb10d7d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bitcoin-cli.cpp
View File

@@ -809,12 +809,12 @@ static UniValue ConnectAndCallRPC(BaseRequestHandler* rh, const std::string& str
} }
} }
break; // Connection succeeded, no need to retry. break; // Connection succeeded, no need to retry.
} catch (const CConnectionFailed&) { } catch (const CConnectionFailed& e) {
const int64_t now = GetTime<std::chrono::seconds>().count(); const int64_t now = GetTime<std::chrono::seconds>().count();
if (fWait && (timeout <= 0 || now < deadline)) { if (fWait && (timeout <= 0 || now < deadline)) {
UninterruptibleSleep(std::chrono::seconds{1}); UninterruptibleSleep(std::chrono::seconds{1});
} else { } else {
throw; throw CConnectionFailed(strprintf("timeout on transient error: %s", e.what()));
} }
} }
} while (fWait); } while (fWait);