From c8e09d8637c346b4653684947a5aff59cc234737 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Sat, 4 Jun 2022 15:43:35 +0000 Subject: [PATCH] Start closing the socket if TLS ends. Don't import apps if we're not running the SSB server (cleans up test output). git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3889 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- src/main.c | 5 ++++- src/socket.js.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 9c31620d..92727e5b 100644 --- a/src/main.c +++ b/src/main.c @@ -357,7 +357,10 @@ static int _tf_run_task(const tf_run_args_t* args, int index) tf_task_set_db_path(task, db_path); tf_task_set_secrets_path(task, secrets_path); tf_task_activate(task); - tf_ssb_import(tf_task_get_ssb(task), "core", "apps"); + if (args->ssb_port) + { + tf_ssb_import(tf_task_get_ssb(task), "core", "apps"); + } if (tf_task_execute(task, args->script)) { tf_task_run(task); diff --git a/src/socket.js.c b/src/socket.js.c index 632adbd1..5b4ff9aa 100644 --- a/src/socket.js.c +++ b/src/socket.js.c @@ -758,6 +758,7 @@ void _socket_onRead(uv_stream_t* stream, ssize_t readSize, const uv_buf_t* buffe tf_util_report_error(context, result); JS_FreeValue(context, result); } + _socket_close_internal(socket); break; } else