libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

server: Refactor stop() to avoid no-async-promise-executor lint error

Browse source 
Also log when Etherpad has stopped.
This commit is contained in:
Richard Hansen 2020-12-22 01:01:37 -05:00 committed by John McLear
parent d339f2a671
commit 725023fe58
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/node/server.js
View file

@ -106,12 +106,15 @@ exports.stop = async () => {
if (stopped) return; if (stopped) return;
stopped = true; stopped = true;
console.log('Stopping Etherpad...'); console.log('Stopping Etherpad...');
await new Promise(async (resolve, reject) => { let timeout = null;
const id = setTimeout(() => reject(new Error('Timed out waiting for shutdown tasks')), 3000); await Promise.race([
await hooks.aCallAll('shutdown'); hooks.aCallAll('shutdown'),
clearTimeout(id); new Promise((resolve, reject) => {
resolve(); timeout = setTimeout(() => reject(new Error('Timed out waiting for shutdown tasks')), 3000);
}); }),
]);
clearTimeout(timeout);
console.log('Etherpad stopped');
}; };
exports.exit = async (err) => { exports.exit = async (err) => {