plugin-bcli: revert the changes

Changelog-None

Signed-off-by: Nishant Bansal <[email protected]>

Author: NishantBansal2003

lightningd/log.c

@@ -1178,4 +1178,4 @@ static const struct json_command getlog_command = {
 	"getlog",
 	json_getlog,
 };
-AUTODATA(json_command, &getlog_command);
+AUTODATA(json_command, &getlog_command);

plugins/bcli.c

@@ -130,7 +130,6 @@ static const char **gather_argsv(const tal_t *ctx, const char *cmd, va_list ap)
 		// system processes.
 		add_arg(&args, "-stdinrpcpass");
 
-
 	add_arg(&args, cmd);
 	while ((arg = va_arg(ap, char *)) != NULL)
 		add_arg(&args, arg);
@@ -1042,46 +1041,50 @@ static void wait_and_check_bitcoind(struct plugin *p)
 	const char **cmd = gather_args(bitcoind, "getnetworkinfo", NULL);
 	char *output = NULL;
 
-	plugin_log(p, LOG_UNUSUAL, "Waiting for bitcoind to warm up...");
+	for (;;) {
+		tal_free(output);
 
-	child = pipecmdarr(&in, &from, &from, cast_const2(char **, cmd));
+		child = pipecmdarr(&in, &from, &from, cast_const2(char **, cmd));
 
-	if (bitcoind->rpcpass)
-		write_all(in, bitcoind->rpcpass, strlen(bitcoind->rpcpass));
+		if (bitcoind->rpcpass)
+			write_all(in, bitcoind->rpcpass, strlen(bitcoind->rpcpass));
 
-	close(in);
+		close(in);
 
-	if (child < 0) {
-		if (errno == ENOENT)
-			bitcoind_failure(
-			    p,
-			    "bitcoin-cli not found. Is bitcoin-cli "
-			    "(part of Bitcoin Core) available in your PATH?");
-		plugin_err(p, "%s exec failed: %s", cmd[0], strerror(errno));
-	}
+		if (child < 0) {
+			if (errno == ENOENT)
+				bitcoind_failure(p, "bitcoin-cli not found. Is bitcoin-cli "
+						    "(part of Bitcoin Core) available in your PATH?");
+			plugin_err(p, "%s exec failed: %s", cmd[0], strerror(errno));
+		}
 
-	output = grab_fd(cmd, from);
+		output = grab_fd(cmd, from);
+
+		while ((ret = waitpid(child, &status, 0)) < 0 && errno == EINTR);
+		if (ret != child)
+			bitcoind_failure(p, tal_fmt(bitcoind, "Waiting for %s: %s",
+						    cmd[0], strerror(errno)));
+		if (!WIFEXITED(status))
+			bitcoind_failure(p, tal_fmt(bitcoind, "Death of %s: signal %i",
+						   cmd[0], WTERMSIG(status)));
+
+		if (WEXITSTATUS(status) == 0)
+			break;
+
+		/* bitcoin/src/rpc/protocol.h:
+		 *	RPC_IN_WARMUP = -28, //!< Client still warming up
+		 */
+		if (WEXITSTATUS(status) != 28) {
+			if (WEXITSTATUS(status) == 1)
+				bitcoind_failure(p, "Could not connect to bitcoind using"
+						    " bitcoin-cli. Is bitcoind running?");
+			bitcoind_failure(p, tal_fmt(bitcoind, "%s exited with code %i: %s",
+						    cmd[0], WEXITSTATUS(status), output));
+		}
 
-	while ((ret = waitpid(child, &status, 0)) < 0 && errno == EINTR)
-		;
-	if (ret != child)
-		bitcoind_failure(p, tal_fmt(bitcoind, "Waiting for %s: %s",
-					    cmd[0], strerror(errno)));
-	if (!WIFEXITED(status))
-		bitcoind_failure(p, tal_fmt(bitcoind, "Death of %s: signal %i",
-					    cmd[0], WTERMSIG(status)));
-
-	/* bitcoin/src/rpc/protocol.h:
-	 *	RPC_IN_WARMUP = -28, //!< Client still warming up
-	 */
-	if (WEXITSTATUS(status) != 28) {
-		if (WEXITSTATUS(status) == 1)
-			bitcoind_failure(p,
-					 "Could not connect to bitcoind using"
-					 " bitcoin-cli. Is bitcoind running?");
-		bitcoind_failure(p,
-				 tal_fmt(bitcoind, "%s exited with code %i: %s",
-					 cmd[0], WEXITSTATUS(status), output));
+		plugin_log(p, LOG_UNUSUAL,
+			   "Waiting for bitcoind to warm up...");
+		sleep(1);
 	}
 
 	parse_getnetworkinfo_result(p, output);