mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 14:47:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Wait for disconnect only if no admintest.

Browse source
This commit is contained in:
SamTV12345 2024-03-11 07:56:49 +01:00
parent 57f114c01e
commit 0c25a0ba1f
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/hooks/express.ts
View file

@ -46,7 +46,7 @@ const closeServer = async () => {
for (const socket of sockets) socket.destroy(new Error('HTTP server is closing')); for (const socket of sockets) socket.destroy(new Error('HTTP server is closing'));
}, 5000); }, 5000);
let lastLogged = 0; let lastLogged = 0;
while (sockets.size > 0) { while (sockets.size > 0 && !settings.enableAdminUITests) {
if (Date.now() - lastLogged > 1000) { // Rate limit to avoid filling logs. if (Date.now() - lastLogged > 1000) { // Rate limit to avoid filling logs.
logger.info(`Waiting for ${sockets.size} HTTP clients to disconnect...`); logger.info(`Waiting for ${sockets.size} HTTP clients to disconnect...`);
lastLogged = Date.now(); lastLogged = Date.now();

2
src/node/hooks/express/socketio.ts
View file

@ -38,7 +38,7 @@ export const expressCloseServer = async () => {
// not appear to be a way to get all clients across all namespaces without tracking them // not appear to be a way to get all clients across all namespaces without tracking them
// ourselves, so that is what we do. // ourselves, so that is what we do.
let lastLogged = 0; let lastLogged = 0;
while (sockets.size > 0) { while (sockets.size > 0 && !settings.enableAdminUITests) {
if (Date.now() - lastLogged > 1000) { // Rate limit to avoid filling logs. if (Date.now() - lastLogged > 1000) { // Rate limit to avoid filling logs.
logger.info(`Waiting for ${sockets.size} socket.io clients to disconnect...`); logger.info(`Waiting for ${sockets.size} socket.io clients to disconnect...`);
lastLogged = Date.now(); lastLogged = Date.now();