Merge branch 'master' into feat/filter

This commit is contained in:
lesion 2022-05-20 14:02:32 +02:00
commit 21f5fc143e
No known key found for this signature in database
GPG key ID: 352918250B012177
5 changed files with 8 additions and 2 deletions

View file

@ -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

View file

@ -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

View file

@ -51,7 +51,6 @@ module.exports = {
// Doc: https://axios.nuxtjs.org/usage
'@nuxtjs/axios',
'@nuxtjs/auth',
// '@/server/initialize.server.js'
],
serverMiddleware: ['server/routes'],

View file

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

View file

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