aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-07 16:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: fix fatal error on startup if bitcoind isn't ready.

Browse Source 
At the moment we simply get a crypto log line on exit:

  bitcoin-cli getblockchaininfo: invalid response

Fixes: 6deed77d88
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-07-26 10:20:09 +09:30
parent 6c7a45623e
commit 57b2fe5890
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lightningd/bitcoind.c
View File

@@ -881,10 +881,6 @@ void wait_for_bitcoind(struct bitcoind *bitcoind)
char *output = grab_fd(cmd, from);
errstr = check_blockchain_from_bitcoincli(tmpctx, bitcoind, output, cmd);
if(errstr)
fatal("%s", errstr);
while ((ret = waitpid(child, &status, 0)) < 0 && errno == EINTR);
if (ret != child)
fatal("Waiting for %s: %s", cmd[0], strerror(errno));
@@ -892,8 +888,14 @@ void wait_for_bitcoind(struct bitcoind *bitcoind)
fatal("Death of %s: signal %i",
cmd[0], WTERMSIG(status));
if (WEXITSTATUS(status) == 0)
if (WEXITSTATUS(status) == 0) {
/* If succeeded, so check answer it gave. */
errstr = check_blockchain_from_bitcoincli(tmpctx, bitcoind, output, cmd);
if (errstr)
fatal("%s", errstr);
break;
}
/* bitcoin/src/rpc/protocol.h:
* RPC_IN_WARMUP = -28, //!< Client still warming up