Merge branch 'master' into feat/filter

This commit is contained in:
lesion
2022-05-20 14:02:32 +02:00
5 changed files with 8 additions and 2 deletions

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