From 920204ae404bfa0a1c31cb5f2930a4f34792fd99 Mon Sep 17 00:00:00 2001 From: lesion Date: Fri, 20 May 2022 13:54:14 +0200 Subject: [PATCH 1/3] add GANCIO_DB_PORT env --- docs/docker/mariadb/docker-compose.yml | 1 + docs/docker/postgres/docker-compose.yml | 1 + server/initialize.server.js | 1 + 3 files changed, 3 insertions(+) diff --git a/docs/docker/mariadb/docker-compose.yml b/docs/docker/mariadb/docker-compose.yml index fdba1ec7..3dab105e 100644 --- a/docs/docker/mariadb/docker-compose.yml +++ b/docs/docker/mariadb/docker-compose.yml @@ -24,6 +24,7 @@ services: - NODE_ENV=production - GANCIO_DB_DIALECT=mariadb - GANCIO_DB_HOST=db + - GANCIO_DB_PORT=3306 - GANCIO_DB_DATABASE=gancio - GANCIO_DB_USERNAME=gancio - GANCIO_DB_PASSWORD=gancio diff --git a/docs/docker/postgres/docker-compose.yml b/docs/docker/postgres/docker-compose.yml index 9bd06169..ad0a61f7 100644 --- a/docs/docker/postgres/docker-compose.yml +++ b/docs/docker/postgres/docker-compose.yml @@ -26,6 +26,7 @@ services: - NODE_ENV=production - GANCIO_DB_DIALECT=postgres - GANCIO_DB_HOST=db + - GANCIO_DB_PORT=5432 - GANCIO_DB_DATABASE=gancio - GANCIO_DB_USERNAME=gancio - GANCIO_DB_PASSWORD=gancio diff --git a/server/initialize.server.js b/server/initialize.server.js index bfc35b4e..b542e430 100644 --- a/server/initialize.server.js +++ b/server/initialize.server.js @@ -20,6 +20,7 @@ module.exports = function () { dialect: process.env.GANCIO_DB_DIALECT, storage: process.env.GANCIO_DB_STORAGE, host: process.env.GANCIO_DB_HOST, + port: process.env.GANCIO_DB_PORT, database: process.env.GANCIO_DB_DATABASE, username: process.env.GANCIO_DB_USERNAME, password: process.env.GANCIO_DB_PASSWORD, From c5cb207a944b4e6e277b2d38af02a1d891dd48d6 Mon Sep 17 00:00:00 2001 From: lesion Date: Fri, 20 May 2022 13:54:57 +0200 Subject: [PATCH 2/3] log error during setup --- server/initialize.server.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/initialize.server.js b/server/initialize.server.js index b542e430..42cae816 100644 --- a/server/initialize.server.js +++ b/server/initialize.server.js @@ -27,7 +27,10 @@ module.exports = function () { } setupController._setupDb(dbConf) - .catch(e => { process.exit(1) }) + .catch(e => { + log.warn(String(e)) + process.exit(1) + }) } await settingsController.load() } From 25cedb5778f228b412a38b5d44154ea7e8ab7968 Mon Sep 17 00:00:00 2001 From: lesion Date: Fri, 20 May 2022 14:01:47 +0200 Subject: [PATCH 3/3] better initialization --- nuxt.config.js | 1 - server/initialize.server.js | 4 +++- server/routes.js | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nuxt.config.js b/nuxt.config.js index e859f70a..3f9a0afb 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -51,7 +51,6 @@ module.exports = { // Doc: https://axios.nuxtjs.org/usage '@nuxtjs/axios', '@nuxtjs/auth', - '@/server/initialize.server.js' ], serverMiddleware: ['server/routes'], diff --git a/server/initialize.server.js b/server/initialize.server.js index 42cae816..06614612 100644 --- a/server/initialize.server.js +++ b/server/initialize.server.js @@ -52,7 +52,9 @@ module.exports = function () { await sequelize.close() process.off('SIGTERM', shutdown) process.off('SIGINT', shutdown) - nuxt.close() + if (nuxt) { + nuxt.close() + } process.exit() } process.on('SIGTERM', shutdown) diff --git a/server/routes.js b/server/routes.js index 9cedb75f..f0d6d065 100644 --- a/server/routes.js +++ b/server/routes.js @@ -1,6 +1,10 @@ const express = require('express') const cookieParser = require('cookie-parser') + +const initialize = require('./initialize.server') +initialize() + // const metricsController = require('./metrics') // const promBundle = require('express-prom-bundle') // const metricsMiddleware = promBundle({ includeMethod: true })