Merge branch 'master' into feat/filter

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

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      

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'],

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()
     }

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 })