From 1fda4c67746ac2bfc08c44d49d89628eefe58625 Mon Sep 17 00:00:00 2001
From: Alex Myers <alex@endothermic.dev>
Date: Wed, 7 Aug 2024 18:22:36 -0500
Subject: [PATCH] reckless-rpc: catch failed reckless subprocess

... before processing the output. It's probably a python backtrace, not
json anyway.
---
 plugins/recklessrpc.c | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/plugins/recklessrpc.c b/plugins/recklessrpc.c
index 6525306aa83a..c64bfb413209 100644
--- a/plugins/recklessrpc.c
+++ b/plugins/recklessrpc.c
@@ -120,26 +120,52 @@ static struct command_result *reckless_result(struct io_conn *conn,
 	return command_finished(reckless->cmd, response);
 }
 
+static struct command_result *reckless_fail(struct reckless *reckless,
+					    char *err)
+{
+	struct json_stream *resp;
+	resp = jsonrpc_stream_fail(reckless->cmd, PLUGIN_ERROR, err);
+	return command_finished(reckless->cmd, resp);
+}
+
 static void reckless_conn_finish(struct io_conn *conn,
 				 struct reckless *reckless)
 {
 	/* FIXME: avoid EBADFD - leave stdin fd open? */
 	if (errno && errno != 9)
 		plugin_log(plugin, LOG_DBG, "err: %s", strerror(errno));
-	reckless_result(conn, reckless);
 	if (reckless->pid > 0) {
-		int status;
+		int status = 0;
 		pid_t p;
 		p = waitpid(reckless->pid, &status, WNOHANG);
 		/* Did the reckless process exit? */
 		if (p != reckless->pid && reckless->pid) {
-			plugin_log(plugin, LOG_DBG, "reckless failed to exit "
-				   "(%i), killing now.", status);
+			plugin_log(plugin, LOG_DBG, "reckless failed to exit, "
+				   "killing now.");
 			kill(reckless->pid, SIGKILL);
+			reckless_fail(reckless, "reckless process hung");
+		/* Reckless process exited and with normal status? */
+		} else if (WIFEXITED(status) && !WEXITSTATUS(status)) {
+			plugin_log(plugin, LOG_DBG,
+				   "Reckless subprocess complete: %s",
+				   reckless->stdoutbuf);
+			reckless_result(conn, reckless);
+		/* Don't try to process json if python raised an error. */
+		} else {
+			plugin_log(plugin, LOG_DBG,
+				   "Reckless process has crashed (%i).",
+				   WEXITSTATUS(status));
+			char * err;
+			if (reckless->process_failed)
+				err = reckless->process_failed;
+			else
+				err = tal_strdup(tmpctx, "the reckless process "
+						 "has crashed");
+			reckless_fail(reckless, err);
+			plugin_log(plugin, LOG_UNUSUAL,
+				   "The reckless subprocess has failed.");
 		}
 	}
-	plugin_log(plugin, LOG_DBG, "Reckless subprocess complete.");
-	plugin_log(plugin, LOG_DBG, "output: %s", reckless->stdoutbuf);
 	io_close(conn);
 	tal_free(reckless);
 }