REMOVE: testing CI

Author: endothermicdev

plugins/recklessrpc.c

@@ -69,6 +69,7 @@ static struct io_plan *read_more(struct io_conn *conn, struct reckless *rkls)
 static struct command_result *reckless_result(struct io_conn *conn,
 					      struct reckless *reckless)
 {
+	io_close(conn);
 	struct json_stream *response;
 	if (reckless->process_failed) {
 		response = jsonrpc_stream_fail(reckless->cmd,
@@ -154,6 +155,14 @@ static void reckless_conn_finish(struct io_conn *conn,
 		plugin_log(plugin, LOG_DBG, "err: %s", strerror(errno));
 	struct pollfd pfd = { .fd = reckless->logfd, .events = POLLIN };
 	poll(&pfd, 1, 20); // wait for any remaining log data
+
+	/* Close the log streaming socket. */
+	if (reckless->logfd) {
+		if (close(reckless->logfd) != 0)
+			plugin_log(plugin, LOG_DBG, "closing log socket failed: %s", strerror(errno));
+		reckless->logfd = 0;
+	}
+
 	if (reckless->pid > 0) {
 		int status = 0;
 		pid_t p;
@@ -162,6 +171,7 @@ static void reckless_conn_finish(struct io_conn *conn,
 		if (p != reckless->pid && reckless->pid) {
 			plugin_log(plugin, LOG_DBG, "reckless failed to exit, "
 				   "killing now.");
+			io_close(conn);
 			kill(reckless->pid, SIGKILL);
 			reckless_fail(reckless, "reckless process hung");
 		/* Reckless process exited and with normal status? */
@@ -253,7 +263,7 @@ static void log_notify(char * log_line TAKES)
 static void log_conn_finish(struct io_conn *conn, struct reckless *reckless)
 {
 	io_close(conn);
-	close(reckless->logfd);
+	reckless->logfd = 0;
 
 }
 

tests/test_reckless.py

@@ -468,6 +468,11 @@ def test_reckless_notifications(node_factory):
     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})
+    NETWORK = os.environ.get('TEST_NETWORK')
+    if not NETWORK:
+        NETWORK = 'regtest'
+    reckless(['listconfig', f'--network={NETWORK}', '--json'],
+             dir=node.lightning_dir)
     node.start()
     listconfig_log = node.rpc.reckless('listconfig')['log']
     # Some trouble escaping the clone url for searching

tools/reckless

@@ -2556,8 +2556,6 @@ if __name__ == '__main__':
 
     if log.capture:
         log.reply_json()
-    # Allow log streaming socket to close before process exits
-    time.sleep(0.20)
+    # We're done streaming to this socket, but the rpc plugin will close it.
     if log.socket:
-        log.socket.close()
-        time.sleep(0.001)
+        log.socket.shutdown(socket.SHUT_WR)