Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

Modified boot to conditionally return an express app

Browse source 
refs 3c7a8dead4

- The idea is a rip-off from the referenced commit. It allows to isolate initialization logic to "frontend" mounted on top of a "parent"
- Gives path to simplify the express-mock tests

Co-authored-by: Hannah Wolfe <erisds@gmail.com>
This commit is contained in:
Naz 2021-12-02 12:00:31 +04:00 • committed by naz
parent b19424acb3
commit de121e1219
1 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
core/boot.js
View file

@ -106,16 +106,19 @@ async function initCore({ghostServer, config, bootLogger, frontend}) {
});
debug('End: Url Service');
// Job Service allows parts of Ghost to run in the background
debug('Begin: Job Service');
const jobService = require('./server/services/jobs');
ghostServer.registerCleanupTask(async () => {
await jobService.shutdown();
});
ghostServer.registerCleanupTask(async () => {
await urlService.shutdown();
});
debug('End: Job Service');
if (ghostServer) {
// Job Service allows parts of Ghost to run in the background
debug('Begin: Job Service');
const jobService = require('./server/services/jobs');
ghostServer.registerCleanupTask(async () => {
await jobService.shutdown();
});
debug('End: Job Service');
ghostServer.registerCleanupTask(async () => {
await urlService.shutdown();
});
}
debug('End: initCore');
}
@ -320,7 +323,7 @@ async function initBackgroundServices({config}) {
* @returns {Promise<object>} ghostServer
*/
async function bootGhost({backend = true, frontend = true} = {}) {
async function bootGhost({backend = true, frontend = true, server = true} = {}) {
// Metrics
const startTime = Date.now();
debug('Begin Boot');
@ -370,11 +373,13 @@ async function bootGhost({backend = true, frontend = true} = {}) {
debug('Begin: load server + minimal app');
const rootApp = require('./app');
const GhostServer = require('./server/ghost-server');
ghostServer = new GhostServer({url: config.getSiteUrl()});
await ghostServer.start(rootApp);
bootLogger.log('server started');
debug('End: load server + minimal app');
if (server) {
const GhostServer = require('./server/ghost-server');
ghostServer = new GhostServer({url: config.getSiteUrl()});
await ghostServer.start(rootApp);
bootLogger.log('server started');
debug('End: load server + minimal app');
}
// Step 3 - Get the DB ready
debug('Begin: Get DB ready');
@ -414,8 +419,13 @@ async function bootGhost({backend = true, frontend = true} = {}) {
initBackgroundServices({config});
// We return the server purely for testing purposes
debug('End Boot: Returning Ghost Server');
return ghostServer;
if (server) {
debug('End Boot: Returning Ghost Server');
return ghostServer;
} else {
debug('End boot: Returning Root App');
return rootApp;
}
} catch (error) {
const errors = require('@tryghost/errors');