From 47ec67702bb3f53a6e3dbb0e9544f8fa84cb69b6 Mon Sep 17 00:00:00 2001 From: Valentine Wallace Date: Thu, 6 Sep 2018 13:16:59 -0700 Subject: [PATCH 1/2] Safely shutdown lnd with SIGINT. --- public/electron.js | 2 +- test/integration/action/action-integration.spec.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/electron.js b/public/electron.js index d67c0f2d4..b2789d9bf 100644 --- a/public/electron.js +++ b/public/electron.js @@ -195,7 +195,7 @@ app.on('activate', () => { }); app.on('quit', () => { - lndProcess && lndProcess.kill(); + lndProcess && lndProcess.kill('SIGINT'); btcdProcess && btcdProcess.kill(); }); diff --git a/test/integration/action/action-integration.spec.js b/test/integration/action/action-integration.spec.js index 198d00ae7..94ea7a2e5 100644 --- a/test/integration/action/action-integration.spec.js +++ b/test/integration/action/action-integration.spec.js @@ -169,8 +169,8 @@ describe('Action Integration Tests', function() { after(async () => { await Promise.all([grpc1.closeLnd(), grpc2.closeLnd()]); - lndProcess1.kill(); - lndProcess2.kill(); + lndProcess1.kill('SIGINT'); + lndProcess2.kill('SIGINT'); btcdProcess.kill(); }); From 4587d483d5b564f7ccafab295eaee1275083a22f Mon Sep 17 00:00:00 2001 From: Valentine Wallace Date: Fri, 7 Sep 2018 18:58:04 -0700 Subject: [PATCH 2/2] Safely shutdown btcd with SIGINT. --- public/electron.js | 2 +- test/integration/action/action-integration.spec.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/electron.js b/public/electron.js index b2789d9bf..85dcb8cd4 100644 --- a/public/electron.js +++ b/public/electron.js @@ -196,7 +196,7 @@ app.on('activate', () => { app.on('quit', () => { lndProcess && lndProcess.kill('SIGINT'); - btcdProcess && btcdProcess.kill(); + btcdProcess && btcdProcess.kill('SIGINT'); }); app.setAsDefaultProtocolClient(PREFIX_NAME); diff --git a/test/integration/action/action-integration.spec.js b/test/integration/action/action-integration.spec.js index 94ea7a2e5..b2347c06e 100644 --- a/test/integration/action/action-integration.spec.js +++ b/test/integration/action/action-integration.spec.js @@ -171,7 +171,7 @@ describe('Action Integration Tests', function() { await Promise.all([grpc1.closeLnd(), grpc2.closeLnd()]); lndProcess1.kill('SIGINT'); lndProcess2.kill('SIGINT'); - btcdProcess.kill(); + btcdProcess.kill('SIGINT'); }); describe('Generate seed and unlock wallet', () => { @@ -223,7 +223,7 @@ describe('Action Integration Tests', function() { }); it('should fund wallet for node1', async () => { - btcdProcess.kill(); + btcdProcess.kill('SIGINT'); btcdArgs.miningAddress = store1.walletAddress; btcdProcess = await startBtcdProcess(btcdArgs); await nap(NAP_TIME);