plugins/bcli: added rpcwait

Changelog-None

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

Author: NishantBansal2003

lightningd/log.c

@@ -1,7 +1,6 @@
 #include "config.h"
 #include <ccan/err/err.h>
 #include <ccan/io/io.h>
-#include <ccan/json_escape/json_escape.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/str/hex/hex.h>
 #include <ccan/tal/link/link.h>
@@ -558,17 +557,23 @@ static void maybe_notify_log(struct logger *log,
 		notify_log(log->log_book->ld, l);
 }
 
-static void add_one_log_entry(struct logger *log, enum log_level level,
-			      const struct node_id *node_id, bool call_notifier,
-			      const char *log_msg)
+void logv(struct logger *log, enum log_level level,
+	  const struct node_id *node_id,
+	  bool call_notifier,
+	  const char *fmt, va_list ap)
 {
+	int save_errno = errno;
 	struct log_entry *l = new_log_entry(log, level, node_id);
 
-	l->log = strdup(log_msg);
+	/* This is WARN_UNUSED_RESULT, because everyone should somehow deal
+	 * with OOM, even though nobody does. */
+	if (vasprintf(&l->log, fmt, ap) == -1)
+		abort();
 
-	/* Sanitize any non-printable characters, and replace with '?'
-	 */
-	for (size_t i = 0; log_msg[i] != '\0'; i++)
+	size_t log_len = strlen(l->log);
+
+	/* Sanitize any non-printable characters, and replace with '?' */
+	for (size_t i=0; i<log_len; i++)
 		if (l->log[i] < ' ' || l->log[i] >= 0x7f)
 			l->log[i] = '?';
 
@@ -579,39 +584,6 @@ static void add_one_log_entry(struct logger *log, enum log_level level,
 
 	if (call_notifier)
 		notify_warning(log->log_book->ld, l);
-}
-
-void logv(struct logger *log, enum log_level level,
-	  const struct node_id *node_id,
-	  bool call_notifier,
-	  const char *fmt, va_list ap)
-{
-	int save_errno = errno;
-	char *log_msg = NULL;
-	const char *unescaped_log;
-
-	/* This is WARN_UNUSED_RESULT, because everyone should somehow deal
-	 * with OOM, even though nobody does. */
-	if (vasprintf(&log_msg, fmt, ap) == -1)
-		abort();
-
-	/* Nothing to escape: simple copy */
-	if (!strchr(log_msg, '\\'))
-		add_one_log_entry(log, level, node_id, call_notifier, log_msg);
-	/* If it's weird, unescaping can fail */
-	else if ((unescaped_log = json_escape_unescape(
-		      tmpctx, (struct json_escape *)log_msg)) == NULL)
-		add_one_log_entry(log, level, node_id, call_notifier, log_msg);
-	else {
-		char **lines = tal_strsplit(unescaped_log, unescaped_log, "\n",
-					    STR_EMPTY_OK);
-		/* Split to lines and log them separately. */
-		for (size_t i = 0; lines[i]; i++)
-			add_one_log_entry(log, level, node_id, call_notifier,
-					  lines[i]);
-	}
-
-	free(log_msg);
 
 	errno = save_errno;
 }
@@ -1206,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

@@ -101,6 +101,7 @@ static const char **gather_argsv(const tal_t *ctx, const char *cmd, va_list ap)
 	const char *arg;
 
 	args[0] = bitcoind->cli ? bitcoind->cli : chainparams->cli;
+	add_arg(&args, "-rpcwait");
 	if (chainparams->cli_args)
 		add_arg(&args, chainparams->cli_args);
 	if (bitcoind->datadir)
@@ -129,6 +130,7 @@ 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);
@@ -1038,56 +1040,48 @@ static void wait_and_check_bitcoind(struct plugin *p)
 	int in, from, status, ret;
 	pid_t child;
 	const char **cmd = gather_args(bitcoind, "getnetworkinfo", NULL);
-	bool printed = false;
 	char *output = NULL;
 
-	for (;;) {
-		tal_free(output);
+	plugin_log(p, LOG_UNUSUAL, "Waiting for bitcoind to warm up...");
 
-		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);
-
-		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));
-		}
+	output = grab_fd(cmd, from);
 
-		if (!printed) {
-			plugin_log(p, LOG_UNUSUAL,
-				   "Waiting for bitcoind to warm up...");
-			printed = true;
-		}
-		sleep(1);
+	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));
 	}
 
 	parse_getnetworkinfo_result(p, output);