From 1c9b4cf552a2aa7e1ad812b180537393be12708e Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Wed, 7 Apr 2021 10:28:33 +0200 Subject: [PATCH] feat(xo-server/Xo): pass appDir, AppName and httpServer As done in xo-proxy. This may allow sharing mixins in the future. --- packages/xo-server/src/index.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/xo-server/src/index.js b/packages/xo-server/src/index.js index d6cd06481..438878ec4 100644 --- a/packages/xo-server/src/index.js +++ b/packages/xo-server/src/index.js @@ -67,13 +67,14 @@ const log = createLogger('xo:main') // =================================================================== +const APP_DIR = joinPath(__dirname, '..') const APP_NAME = 'xo-server' const DEPRECATED_ENTRIES = ['users', 'servers'] async function loadConfiguration() { const config = await appConf.load(APP_NAME, { - appDir: joinPath(__dirname, '..'), + appDir: APP_DIR, ignoreUnknownFormats: true, }) @@ -720,7 +721,13 @@ export default async function main(args) { const safeMode = includes(args, '--safe-mode') // Creates main object. - const xo = new Xo({ config, safeMode }) + const xo = new Xo({ + appDir: APP_DIR, + appName: APP_NAME, + config, + httpServer: webServer, + safeMode, + }) // Register web server close on XO stop. xo.on('stop', () => fromCallback.call(webServer, 'stop'))