diff --git a/server/api/models/index.js b/server/api/models/index.js index 991f166f..5a4e3cc6 100644 --- a/server/api/models/index.js +++ b/server/api/models/index.js @@ -62,7 +62,7 @@ const db = { return umzug.up() }, async initialize () { - if (config.status === 'READY') { + if (config.status === 'CONFIGURED') { try { await db.connect() log.debug('Running migrations') diff --git a/server/config.js b/server/config.js index a9f02927..7fe0dca3 100644 --- a/server/config.js +++ b/server/config.js @@ -26,7 +26,7 @@ let config = { if (fs.existsSync(config_path)) { const configContent = fs.readFileSync(config_path) config = Object.assign(config, JSON.parse(configContent)) - config.status = 'READY' + config.status = 'CONFIGURED' if (!config.hostname) { config.hostname = new URL.URL(config.baseurl).hostname } diff --git a/server/initialize.server.js b/server/initialize.server.js index cb21c17b..51b6d9d4 100644 --- a/server/initialize.server.js +++ b/server/initialize.server.js @@ -25,8 +25,9 @@ const initialize = { const dayjs = require('dayjs') const timezone = require('dayjs/plugin/timezone') dayjs.extend(timezone) - if (config.status == 'READY') { + if (config.status == 'CONFIGURED') { await db.initialize() + config.status = 'READY' } else { if (process.env.GANCIO_DB_DIALECT) { const setupController = require('./api/controller/setup') diff --git a/server/routes.js b/server/routes.js index a7ed8458..0cee017c 100644 --- a/server/routes.js +++ b/server/routes.js @@ -3,29 +3,27 @@ const cookieParser = require('cookie-parser') const app = express() const initialize = require('./initialize.server') +const config = require('./config') +const helpers = require('./helpers') +app.use(helpers.setUserLocale) +app.use(helpers.initSettings) +app.use(helpers.logRequest) +app.use(helpers.serveStatic()) +app.use(cookieParser()) + async function main () { await initialize.start() - + // const metricsController = require('./metrics') // const promBundle = require('express-prom-bundle') // const metricsMiddleware = promBundle({ includeMethod: true }) - - const config = require('./config') - - const helpers = require('./helpers') + + const log = require('./log') const api = require('./api') - + app.enable('trust proxy') - app.use(helpers.logRequest) - - app.use(helpers.initSettings) - app.use(helpers.setUserLocale) - app.use(helpers.serveStatic()) - - app.use(cookieParser()) - // do not handle all routes on setup if (config.status === 'READY') {