From 560215969197fe031c0c9f713bce03083c365682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 17 Aug 2023 15:04:08 -0400 Subject: [PATCH] hmm node 20, yummy --- .github/workflows/test.yaml | 8 +++----- src/start.js | 8 +++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c97b7fb8da..80e8d4e1ed 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -5,12 +5,10 @@ on: branches: - master - develop - - bootstrap5 pull_request: branches: - master - develop - - bootstrap5 defaults: run: @@ -29,19 +27,19 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - node: [16, 18] + node: [16, 18, 20] database: [mongo-dev, mongo, redis, postgres] include: # only run coverage once - os: ubuntu-latest - node: 16 + node: 18 coverage: true # test under development once - database: mongo-dev test_env: development # only run eslint once - os: ubuntu-latest - node: 16 + node: 18 database: mongo-dev lint: true runs-on: ${{ matrix.os }} diff --git a/src/start.js b/src/start.js index f87f0b4ddf..94a785bcc7 100644 --- a/src/start.js +++ b/src/start.js @@ -95,8 +95,9 @@ function printStartupInfo() { } function addProcessHandlers() { - process.on('SIGTERM', shutdown); - process.on('SIGINT', shutdown); + ['SIGTERM', 'SIGINT', 'SIGQUIT'].forEach((signal) => { + process.on(signal, () => shutdown()); + }); process.on('SIGHUP', restart); process.on('uncaughtException', (err) => { winston.error(err.stack); @@ -130,7 +131,7 @@ function restart() { } async function shutdown(code) { - winston.info('[app] Shutdown (SIGTERM/SIGINT) Initialised.'); + winston.info('[app] Shutdown (SIGTERM/SIGINT/SIGQUIT) Initialised.'); try { await require('./webserver').destroy(); winston.info('[app] Web server closed to connections.'); @@ -142,6 +143,7 @@ async function shutdown(code) { process.exit(code || 0); } catch (err) { winston.error(err.stack); + return process.exit(code || 0); } }