Merge branch 'master' into feat/filter
This commit is contained in:
@@ -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()
|
||||
}
|
||||
|
||||
@@ -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 })
|
||||
|
||||
Reference in New Issue
Block a user