TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-24 19:33:02 +03:00
Code Issues Projects Releases Wiki Activity

Fixed attempts to stop server that isn't listening

Browse Source 
- if our http server isn't listening yet, stop will throw an error
- also changeded the stopServer code to prefer a more readable syntax
This commit is contained in:
Hannah Wolfe 2021-02-15 19:14:48 +00:00
parent ef76279084
commit e0354ea5a0
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/server/ghost-server.js
View File

@ -183,14 +183,12 @@ class GhostServer {
* @returns {Promise} Resolves once Ghost has stopped
*/
async stop() {
// If we never fully started, there's nothing to stop
if (this.httpServer === null) {
return;
}
try {
// We stop the server first so that no new long running requests or processes can be started
await this._stopServer();
// If we never fully started, there's nothing to stop
if (this.httpServer && this.httpServer.listening) {
// We stop the server first so that no new long running requests or processes can be started
await this._stopServer();
}
// Do all of the cleanup tasks
await this._cleanup();
} finally {
@ -234,7 +232,14 @@ class GhostServer {
*/
async _stopServer() {
return new Promise((resolve, reject) => {
this.httpServer.stop((err, status) => (err ? reject(err) : resolve(status)));
this.httpServer
.stop((error, status) => {
if (error) {
return reject(error);
}
return resolve(status);
});
});
}