luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 20:32:56 +00:00
Code Issues Projects Releases Wiki Activity

Check if port/socket is available before forking in Streaming API (#9023)

Browse source 
Previously, the server would attempt taking port/socket in worker
process, and if it was taken, fail, which made the master process
create a new worker. This led to really high CPU usage if the
streaming API was started when the port or socket were not
available.

Now, before clustering (forking) into worker processes, a test
server is created and then removed to check if it can be done.
This commit is contained in:
Eugen Rochko 2018-10-20 02:25:25 +02:00 committed by GitHub
parent eb1b9903a6
commit 369cc5f555
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
streaming/index.js
View file

@ -74,6 +74,7 @@ const startMaster = () => {
if (!process.env.SOCKET && process.env.PORT && isNaN(+process.env.PORT)) { if (!process.env.SOCKET && process.env.PORT && isNaN(+process.env.PORT)) {
log.warn('UNIX domain socket is now supported by using SOCKET. Please migrate from PORT hack.'); log.warn('UNIX domain socket is now supported by using SOCKET. Please migrate from PORT hack.');
} }
log.info(`Starting streaming API server master with ${numWorkers} workers`); log.info(`Starting streaming API server master with ${numWorkers} workers`);
}; };
@ -616,16 +617,9 @@ const startWorker = (workerId) => {
}); });
}, 30000); }, 30000);
if (process.env.SOCKET || process.env.PORT && isNaN(+process.env.PORT)) { attachServerWithConfig(server, address => {
server.listen(process.env.SOCKET || process.env.PORT, () => { log.info(`Worker ${workerId} now listening on ${address}`);
fs.chmodSync(server.address(), 0o666);
log.info(`Worker ${workerId} now listening on ${server.address()}`);
}); });
} else {
server.listen(+process.env.PORT || 4000, process.env.BIND || '0.0.0.0', () => {
log.info(`Worker ${workerId} now listening on ${server.address().address}:${server.address().port}`);
});
}
const onExit = () => { const onExit = () => {
log.info(`Worker ${workerId} exiting, bye bye`); log.info(`Worker ${workerId} exiting, bye bye`);
@ -645,9 +639,49 @@ const startWorker = (workerId) => {
process.on('uncaughtException', onError); process.on('uncaughtException', onError);
}; };
throng({ const attachServerWithConfig = (server, onSuccess) => {
if (process.env.SOCKET || process.env.PORT && isNaN(+process.env.PORT)) {
server.listen(process.env.SOCKET || process.env.PORT, () => {
fs.chmodSync(server.address(), 0o666);
if (onSuccess) {
onSuccess(server.address());
}
});
} else {
server.listen(+process.env.PORT || 4000, process.env.BIND || '0.0.0.0', () => {
if (onSuccess) {
onSuccess(`${server.address().address}:${server.address().port}`);
}
});
}
};
const onPortAvailable = onSuccess => {
const testServer = http.createServer();
testServer.once('error', err => {
onSuccess(err);
});
testServer.once('listening', () => {
testServer.once('close', () => onSuccess());
testServer.close();
});
attachServerWithConfig(testServer);
};
onPortAvailable(err => {
if (err) {
log.error('Could not start server, the port or socket is in use');
return;
}
throng({
workers: numWorkers, workers: numWorkers,
lifetime: Infinity, lifetime: Infinity,
start: startWorker, start: startWorker,
master: startMaster, master: startMaster,
});
}); });