TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-09-22 10:29:04 +03:00
Code Issues Projects Releases Wiki Activity

Switched to using config-url-utils in boot.js

Browse Source 
- config now exposes a few helpful methods: getSubdir, getSiteUrl, and getAdminUrl
- we can use these directly, instead of needing url-utils
- switching this inside of the boot process allows us to move the loading of url-utils into `initCore` which happens after the server has started and the database is ready
- this moves 100ms of loading time to later in the process
- also simplifies the initial loading
This commit is contained in:
Hannah Wolfe 2021-06-28 10:50:41 +01:00
parent 081d3b3a38
commit d9e8d9c148
No known key found for this signature in database
GPG Key ID: 9F8C7532D0A6BA55
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/boot.js
View File

@ -65,6 +65,12 @@ async function initDatabase({config, logging}) {
*/ */
async function initCore({ghostServer}) { async function initCore({ghostServer}) {
debug('Begin: initCore'); debug('Begin: initCore');
// URL Utils is a bit slow, put it here so the timing is visible separate from models
debug('Begin: Load urlUtils');
require('./shared/url-utils');
debug('End: Load urlUtils');
// Models are the heart of Ghost - this is a syncronous operation // Models are the heart of Ghost - this is a syncronous operation
debug('Begin: models'); debug('Begin: models');
const models = require('./server/models'); const models = require('./server/models');
@ -293,15 +299,11 @@ async function bootGhost() {
i18n.init(); i18n.init();
debug('End: i18n'); debug('End: i18n');
debug('Begin: Load urlUtils');
const urlUtils = require('./shared/url-utils');
debug('End: Load urlUtils');
// Step 2 - Start server with minimal app in global maintenance mode // Step 2 - Start server with minimal app in global maintenance mode
debug('Begin: load server + minimal app'); debug('Begin: load server + minimal app');
const rootApp = require('./app'); const rootApp = require('./app');
const GhostServer = require('./server/ghost-server'); const GhostServer = require('./server/ghost-server');
ghostServer = new GhostServer({url: urlUtils.urlFor('home', true)}); ghostServer = new GhostServer({url: config.getSiteUrl()});
await ghostServer.start(rootApp); await ghostServer.start(rootApp);
bootLogger.log('server started'); bootLogger.log('server started');
debug('End: load server + minimal app'); debug('End: load server + minimal app');
@ -324,7 +326,7 @@ async function bootGhost() {
// Step 5 - Mount the full Ghost app onto the minimal root app & disable maintenance mode // Step 5 - Mount the full Ghost app onto the minimal root app & disable maintenance mode
debug('Begin: mountGhost'); debug('Begin: mountGhost');
rootApp.disable('maintenance'); rootApp.disable('maintenance');
rootApp.use(urlUtils.getSubdir(), ghostApp); rootApp.use(config.getSubdir(), ghostApp);
debug('End: mountGhost'); debug('End: mountGhost');
// Step 6 - We are technically done here - let everyone know! // Step 6 - We are technically done here - let everyone know!