mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-03 10:46:58 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: verbose debugging for bitcoind commands.

Browse source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2018-09-19 12:02:36 +09:30 • committed by Christian Decker
parent 9b8c8f652b
commit e7a0ffca05
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lightningd/bitcoind.c
View file

@ -74,6 +74,7 @@ struct bitcoin_cli {
int *exitstatus; int *exitstatus;
pid_t pid; pid_t pid;
const char **args; const char **args;
struct timeabs start;
char *output; char *output;
size_t output_bytes; size_t output_bytes;
size_t new_output; size_t new_output;
@ -157,6 +158,10 @@ static void bcli_finished(struct io_conn *conn UNUSED, struct bitcoin_cli *bcli)
struct bitcoind *bitcoind = bcli->bitcoind; struct bitcoind *bitcoind = bcli->bitcoind;
bool ok; bool ok;
log_debug(bitcoind->log, "bitcoin-cli: finished %s (%"PRIu64" ms)",
bcli_args(tmpctx, bcli),
time_to_msec(time_between(time_now(), bcli->start)));
/* FIXME: If we waited for SIGCHILD, this could never hang! */ /* FIXME: If we waited for SIGCHILD, this could never hang! */
while ((ret = waitpid(bcli->pid, &status, 0)) < 0 && errno == EINTR); while ((ret = waitpid(bcli->pid, &status, 0)) < 0 && errno == EINTR);
if (ret != bcli->pid) if (ret != bcli->pid)
@ -211,11 +216,15 @@ static void next_bcli(struct bitcoind *bitcoind)
if (!bcli) if (!bcli)
return; return;
log_debug(bitcoind->log, "bitcoin-cli: starting %s",
bcli_args(tmpctx, bcli));
bcli->pid = pipecmdarr(&bcli->fd, NULL, &bcli->fd, bcli->pid = pipecmdarr(&bcli->fd, NULL, &bcli->fd,
cast_const2(char **, bcli->args)); cast_const2(char **, bcli->args));
if (bcli->pid < 0) if (bcli->pid < 0)
fatal("%s exec failed: %s", bcli->args[0], strerror(errno)); fatal("%s exec failed: %s", bcli->args[0], strerror(errno));
bcli->start = time_now();
bitcoind->current = bcli; bitcoind->current = bcli;
/* This lifetime is attached to bitcoind command fd */ /* This lifetime is attached to bitcoind command fd */
conn = notleak(io_new_conn(bitcoind, bcli->fd, output_init, bcli)); conn = notleak(io_new_conn(bitcoind, bcli->fd, output_init, bcli));