public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

express: Factor out common server shutdown logic 

Also log when the HTTP server is about to be closed and when it is
done closing.
pull/4613/head
Richard Hansen 2020-12-22 00:41:13 -05:00
parent ff19181cd1
commit 3e8c3e5789
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/node/hooks/express.js
View File

@ -17,6 +17,14 @@ let serverName;
exports.server = null; exports.server = null;
const closeServer = async () => {
if (exports.server == null) return;
logger.info('Closing HTTP server...');
await util.promisify(exports.server.close.bind(exports.server))();
exports.server = null;
logger.info('HTTP server closed');
};
exports.createServer = async () => { exports.createServer = async () => {
console.log('Report bugs at https://github.com/ether/etherpad-lite/issues'); console.log('Report bugs at https://github.com/ether/etherpad-lite/issues');
@ -50,10 +58,7 @@ exports.createServer = async () => {
}; };
exports.restartServer = async () => { exports.restartServer = async () => {
if (exports.server) { await closeServer();
console.log('Restarting express server');
await util.promisify(exports.server.close).bind(exports.server)();
}
const app = express(); // New syntax for express v3 const app = express(); // New syntax for express v3
@ -181,6 +186,5 @@ exports.restartServer = async () => {
}; };
exports.shutdown = async (hookName, context) => { exports.shutdown = async (hookName, context) => {
if (!exports.server) return; await closeServer();
await util.promisify(exports.server.close).bind(exports.server)();
}; };