From 3931c204babdb368f0158c2adfcbe718da778ce2 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Mon, 6 Feb 2023 22:56:31 +0000 Subject: [PATCH 1/3] improve abort message --- lib.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib.js b/lib.js index 4368b54..5b35408 100644 --- a/lib.js +++ b/lib.js @@ -607,7 +607,9 @@ async function runStorageRPCTest(lokinet, config, cb) { var responded = false var ref = { abort: function () { - console.log('runStorageRPCTest abort: never called httpGet?') + // usually get this why oxend is syncing... + // sometimes httpGet wasn't called + console.log('runStorageRPCTest abort or timeout, is oxend syncing?') } } var storage_rpc_timer = setTimeout(function() { From 3096a0d380e0d18d75331f85e0964af51b317a59 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 20 Feb 2024 07:46:48 +0000 Subject: [PATCH 2/3] shutdown_storage murders storage server 2nd call --- daemon.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/daemon.js b/daemon.js index c2fbcb6..70824af 100644 --- a/daemon.js +++ b/daemon.js @@ -101,6 +101,12 @@ function shutdown_blockchain() { } function shutdown_storage() { + if (storageServer && storageServer.killed)) { + if (lib.isPidRunning(storageServer.pid)) { + console.log('LAUNCHER: killing SS again') + process.kill(storageServer.pid, 'SIGKILL') + } + } if (storageServer && !storageServer.killed) { // FIXME: was killed not set? try { @@ -530,6 +536,7 @@ function launcherStorageServer(config, args, cb) { if (data === undefined) { console.log('STORAGE: RPC server not responding, restarting storage server') shutdown_storage() + // what restarts this? something does } }) } From 9e841c202444b92f27e803da2a6e0f60e46251b2 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 20 Feb 2024 07:49:48 +0000 Subject: [PATCH 3/3] fix typo --- daemon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon.js b/daemon.js index 70824af..2d6542e 100644 --- a/daemon.js +++ b/daemon.js @@ -101,7 +101,7 @@ function shutdown_blockchain() { } function shutdown_storage() { - if (storageServer && storageServer.killed)) { + if (storageServer && storageServer.killed) { if (lib.isPidRunning(storageServer.pid)) { console.log('LAUNCHER: killing SS again') process.kill(storageServer.pid, 'SIGKILL')