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/nuxt.config.js b/nuxt.config.js index 59d7a60c..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 23768e76..bab87cc9 100644 --- a/server/initialize.server.js +++ b/server/initialize.server.js @@ -26,7 +26,10 @@ module.exports = function () { } setupController._setupDb(dbConf) - .catch(e => { process.exit(1) }) + .catch(e => { + log.warn(String(e)) + process.exit(1) + }) } await settingsController.load() } diff --git a/server/routes.js b/server/routes.js index 8065d7f9..c6d80237 100644 --- a/server/routes.js +++ b/server/routes.js @@ -1,8 +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 })