diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-11-20 17:57:43 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-11-20 17:57:43 -0800 |
| commit | 34f5b0ab93e4f92e92531afa090caba06a031c68 (patch) | |
| tree | 8ac47d1d46c08c7aa5c6759e19f41befd3f9c1d0 | |
| parent | d980f9b7d687a1e60eecf3691b592d9806a30f4a (diff) | |
| parent | 480e75ceabdf83438023d066ed494c371fcef239 (diff) | |
Merge pull request #3283 from gavinandresen/rpcwait
RPC client option: -rpcwait, to wait for server start
| -rw-r--r-- | src/bitcoinrpc.cpp | 12 | ||||
| -rw-r--r-- | src/init.cpp | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 9d45779b2c..a1e7d14dcc 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1122,8 +1122,16 @@ Object CallRPC(const string& strMethod, const Array& params) asio::ssl::stream<asio::ip::tcp::socket> sslStream(io_service, context); SSLIOStreamDevice<asio::ip::tcp> d(sslStream, fUseSSL); iostreams::stream< SSLIOStreamDevice<asio::ip::tcp> > 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 d930f6f693..b2e7ddf335 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=<ip> " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n"; + strUsage += " -rpcwait " + _("Wait for RPC server to start") + "\n"; } strUsage += " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n"; |