github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #16888 from overleaf/jpa-faster-filestore-stop-in-dev

Browse source 
[misc] use a common environment variable for the graceful shutdown delay

GitOrigin-RevId: 010e83c62eff7bedac3b10e36e9b4f38d6459a1c
This commit is contained in:
Jakob Ackermann 2024-02-05 10:45:28 +00:00 committed by Copybot
parent 621301618f
commit fd717dff01
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/document-updater/app.js
View file

@ -217,7 +217,7 @@ const shutdownCleanly = signal => () => {
setTimeout(() => { setTimeout(() => {
logger.info({ signal }, 'shutting down') logger.info({ signal }, 'shutting down')
process.exit() process.exit()
}, Settings.delayShutdownMs) }, Settings.gracefulShutdownDelayInMs)
} }
const watchForEvent = eventName => { const watchForEvent = eventName => {

3
services/document-updater/config/settings.defaults.js
View file

@ -168,5 +168,6 @@ module.exports = {
continuousBackgroundFlush: process.env.CONTINUOUS_BACKGROUND_FLUSH === 'true', continuousBackgroundFlush: process.env.CONTINUOUS_BACKGROUND_FLUSH === 'true',
smoothingOffset: process.env.SMOOTHING_OFFSET || 1000, // milliseconds smoothingOffset: process.env.SMOOTHING_OFFSET || 1000, // milliseconds
delayShutdownMs: parseInt(process.env.DELAY_SHUTDOWN_MS || '10000', 10), gracefulShutdownDelayInMs:
parseInt(process.env.GRACEFUL_SHUTDOWN_DELAY_SECONDS ?? '10', 10) * 1000,
} }

2
services/filestore/app.js
View file

@ -192,7 +192,7 @@ function handleShutdownSignal(signal) {
setTimeout(() => { setTimeout(() => {
logger.info({ signal }, 'shutting down') logger.info({ signal }, 'shutting down')
process.exit() process.exit()
}, settings.delayShutdownMs) }, settings.gracefulShutdownDelayInMs)
} }
process.on('SIGTERM', handleShutdownSignal) process.on('SIGTERM', handleShutdownSignal)

3
services/filestore/config/settings.defaults.js
View file

@ -113,7 +113,8 @@ const settings = {
dsn: process.env.SENTRY_DSN, dsn: process.env.SENTRY_DSN,
}, },
delayShutdownMs: parseInt(process.env.DELAY_SHUTDOWN_MS || '30000', 10), gracefulShutdownDelayInMs:
parseInt(process.env.GRACEFUL_SHUTDOWN_DELAY_SECONDS ?? '30', 10) * 1000,
} }
// Filestore health check // Filestore health check