diff --git a/services/real-time/app.coffee b/services/real-time/app.coffee index d3ee470a8e..17d2d5bcf9 100644 --- a/services/real-time/app.coffee +++ b/services/real-time/app.coffee @@ -96,15 +96,14 @@ shutdownCleanly = (signal) -> , 10000 forceDrain = -> - THREE_HOURS = 60 * 1000 * 60 * 3 - logger.log {delay_ms:THREE_HOURS}, "starting force drain after timeout" + forceDrainMsDelay = parseInt(Settings.forceDrainMsDelay, 10) + logger.log {delay_ms:forceDrainMsDelay}, "starting force drain after timeout" setTimeout ()-> logger.log "starting drain" DrainManager.startDrain(io, 4) - , THREE_HOURS + , Settings.forceDrainMsDelay - -if Settings.delayExitUntilDrained +if Settings.forceDrainMsDelay? logger.log "drainBeforeShutdown enabled" for signal in ['SIGINT', 'SIGHUP', 'SIGQUIT', 'SIGUSR1', 'SIGUSR2', 'SIGTERM', 'SIGABRT'] logger.log signal: signal, "received interrupt, cleaning up" diff --git a/services/real-time/config/settings.defaults.coffee b/services/real-time/config/settings.defaults.coffee index 75f86db306..8eac78da5a 100644 --- a/services/real-time/config/settings.defaults.coffee +++ b/services/real-time/config/settings.defaults.coffee @@ -42,4 +42,4 @@ module.exports = max_doc_length: 2 * 1024 * 1024 # 2mb - delayExitUntilDrained: process.env['DELAY_EXIT_UNTIL_DRAINED'] or false \ No newline at end of file + forceDrainMsDelay: process.env['FORCE_DRAIN_MS_DELAY'] or false \ No newline at end of file