From 480e75ceabdf83438023d066ed494c371fcef239 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Wed, 20 Nov 2013 15:54:13 +1000 Subject: [PATCH] RPC client option: -rpcwait, to wait for server start --- src/bitcoinrpc.cpp | 12 ++++++++++-- src/init.cpp | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index c715f13fd24..343bb1a5e8e 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1124,8 +1124,16 @@ Object CallRPC(const string& strMethod, const Array& params) asio::ssl::stream sslStream(io_service, context); SSLIOStreamDevice d(sslStream, fUseSSL); iostreams::stream< SSLIOStreamDevice > stream(d); - if (!d.connect(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", itostr(Params().RPCPort())))) - throw runtime_error("couldn't connect to server"); + + bool fWait = GetBoolArg("-rpcwait", false); // -rpcwait means try until server has started + do { + bool fConnected = d.connect(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", itostr(Params().RPCPort()))); + if (fConnected) break; + if (fWait) + MilliSleep(1000); + else + throw runtime_error("couldn't connect to server"); + } while (fWait); // HTTP basic authentication string strUserPass64 = EncodeBase64(mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"]); diff --git a/src/init.cpp b/src/init.cpp index d930f6f6935..b2e7ddf3358 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -253,6 +253,7 @@ std::string HelpMessage(HelpMessageMode hmm) if (hmm == HMM_BITCOIND || hmm == HMM_BITCOIN_CLI) { strUsage += " -rpcconnect= " + _("Send commands to node running on (default: 127.0.0.1)") + "\n"; + strUsage += " -rpcwait " + _("Wait for RPC server to start") + "\n"; } strUsage += " -rpcuser= " + _("Username for JSON-RPC connections") + "\n";