reckless-rpc: publish reckless log notifications

Changelog-added: The reckless-rpc plugin streams logs via the notification topic 'reckless_log'

Author: endothermicdev

plugins/recklessrpc.c

@@ -241,6 +241,13 @@ static bool is_single_arg_cmd(const char *command) {
 	return false;
 }
 
+static void log_notify(char * log_line TAKES)
+{
+	struct json_stream *js = plugin_notification_start(NULL, "reckless_log");
+	json_add_stringn(js, "log", log_line, tal_count(log_line));
+	plugin_notification_end(plugin, js);
+}
+
 static void log_conn_finish(struct io_conn *conn, struct reckless *reckless)
 {
 	io_close(conn);
@@ -263,8 +270,8 @@ static struct io_plan *log_read_more(struct io_conn *conn,
 		char * note;
 		note = tal_strndup(tmpctx, rkls->log_to_process,
 				   lineend - rkls->log_to_process);
-		/* FIXME: Add notification for the utility logs. */
-		plugin_log(plugin, LOG_DBG, "RECKLESS UTILITY: %s", note);
+		plugin_log(plugin, LOG_DBG, "reckless utility: %s", note);
+		log_notify(note);
 		rkls->log_to_process = lineend + 1;
 		unprocessed = rkls->log_read - (rkls->log_to_process - rkls->logbuf);
 		lineend = memchr(rkls->log_to_process, 0x0A, unprocessed);
@@ -444,6 +451,10 @@ static const struct plugin_command commands[] = {
 	},
 };
 
+static const char *notifications[] = {
+	"reckless_log",
+};
+
 int main(int argc, char **argv)
 {
 	setup_locale();
@@ -453,7 +464,7 @@ int main(int argc, char **argv)
 		    commands, ARRAY_SIZE(commands),
 		    NULL, 0,	/* Notifications */
 		    NULL, 0,	/* Hooks */
-		    NULL, 0,	/* Notification topics */
+		    notifications, ARRAY_SIZE(notifications),	/* Notification topics */
 		    NULL);	/* plugin options */
 
 	return 0;

tests/plugins/custom_notifications.py

@@ -51,5 +51,10 @@ def on_faulty_emit(origin, payload, **kwargs):
     plugin.log("Got the ididntannouncethis event")
 
 
+@plugin.subscribe("reckless_log")
+def on_reckless_log(origin, **kwargs):
+    plugin.log("Got reckless_log: {}".format(kwargs))
+
+
 plugin.add_notification_topic("custom")
 plugin.run()

tests/test_reckless.py

@@ -140,10 +140,10 @@ def reckless(cmds: list, dir: PosixPath = None,
     return RecklessResult(r, r.returncode, stdout, stderr)
 
 
-def get_reckless_node(node_factory):
+def get_reckless_node(node_factory, options={}, start=False):
     '''This may be unnecessary, but a preconfigured lightning dir
     is useful for reckless testing.'''
-    node = node_factory.get_node(options={}, start=False)
+    node = node_factory.get_node(options=options, start=start)
     return node
 
 
@@ -461,3 +461,16 @@ def test_reckless_available(node_factory):
     assert r.search_stdout('testplugpass')
     assert r.search_stdout('testplugpyproj')
     assert r.search_stdout('testpluguv')
+
+
+def test_reckless_notifications(node_factory):
+    """Reckless streams logs to the reckless-rpc plugin which are emitted
+    as 'reckless_log' notifications"""
+    notification_plugin = os.path.join(os.getcwd(), 'tests/plugins/custom_notifications.py')
+    node = get_reckless_node(node_factory, options={"plugin": notification_plugin})
+    node.start()
+    listconfig_log = node.rpc.reckless('listconfig')['log']
+    # Some trouble escaping the clone url for searching
+    listconfig_log.pop(1)
+    for log in listconfig_log:
+        assert node.daemon.is_in_log(f"reckless_log: {{'reckless_log': {{'log': '{log}'", start=0)