Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Extended bootstrap socket handling

Browse source 
no issue

- if you have a bootstrap socket configured, but the socket does not appear, Ghost would crash
- cases:
  - your server bootstraps (Ghost-CLI automatically starts Ghost via systemd)
  - you add a bootstrap config in your Ghost config manually, but you don't start a net server
- added handling to catch errors and retry 3 times
This commit is contained in:
kirrg001 2018-08-14 19:04:25 +02:00 • committed by Katharina Irrgang
parent ee7814cb1f
commit 450cec7836
1 changed files with 87 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
core/server/ghost-server.js
View file

@ -230,6 +230,88 @@ GhostServer.prototype.logShutdownMessages = function () {
module.exports = GhostServer;
const connectToBootstrapSocket = (message) => {
const socketAddress = config.get('bootstrap-socket');
const net = require('net');
const client = new net.Socket();
return new Promise((resolve) => {
const connect = (options = {}) => {
let wasResolved = false;
const waitTimeout = setTimeout(() => {
common.logging.info('Bootstrap socket timed out.');
if (!client.destroyed) {
client.destroy();
}
if (wasResolved) {
return;
}
wasResolved = true;
resolve();
}, 1000 * 5);
client.connect(socketAddress.port, socketAddress.host, () => {
if (waitTimeout) {
clearTimeout(waitTimeout);
}
client.write(JSON.stringify(message));
if (wasResolved) {
return;
}
wasResolved = true;
resolve();
});
client.on('close', () => {
common.logging.info('Bootstrap client was closed.');
if (waitTimeout) {
clearTimeout(waitTimeout);
}
});
client.on('error', (err) => {
common.logging.warn(`Can\'t connect to the bootstrap socket (${socketAddress.host} ${socketAddress.port}) ${err.code}`);
client.removeAllListeners();
if (waitTimeout) {
clearTimeout(waitTimeout);
}
if (options.tries < 3) {
common.logging.warn(`Tries: ${options.tries}`);
// retry
common.logging.warn('Retrying...');
options.tries = options.tries + 1;
const retryTimeout = setTimeout(() => {
clearTimeout(retryTimeout);
connect(options);
}, 150);
} else {
if (wasResolved) {
return;
}
wasResolved = true;
resolve();
}
});
};
connect({tries: 0});
});
};
module.exports.announceServerStart = function announceServerStart() {
common.events.emit('server.start');
@ -242,30 +324,8 @@ module.exports.announceServerStart = function announceServerStart() {
// CASE: Ghost extension - bootstrap sockets
if (config.get('bootstrap-socket')) {
const socketAddress = config.get('bootstrap-socket');
const net = require('net');
const client = new net.Socket();
return new Promise((resolve) => {
const waitTimeout = setTimeout(() => {
client.destroy();
resolve();
}, 1000 * 5);
client.connect(socketAddress.port, socketAddress.host, () => {
if (waitTimeout) {
clearTimeout(waitTimeout);
}
client.write(JSON.stringify({started: true}));
resolve();
});
client.on('close', () => {
if (waitTimeout) {
clearTimeout(waitTimeout);
}
});
return connectToBootstrapSocket({
started: true
});
}
@ -283,30 +343,9 @@ module.exports.announceServerStopped = function announceServerStopped(error) {
// CASE: Ghost extension - bootstrap sockets
if (config.get('bootstrap-socket')) {
const socketAddress = config.get('bootstrap-socket');
const net = require('net');
const client = new net.Socket();
return new Promise((resolve) => {
const waitTimeout = setTimeout(() => {
client.destroy();
resolve();
}, 1000 * 5);
client.connect(socketAddress.port, socketAddress.host, () => {
if (waitTimeout) {
clearTimeout(waitTimeout);
}
client.write(JSON.stringify({started: false, error: error}));
resolve();
});
client.on('close', () => {
if (waitTimeout) {
clearTimeout(waitTimeout);
}
});
return connectToBootstrapSocket({
started: false,
error: error
});
}