Henry Oswald пре 7 година
родитељ
комит
05611de15e
2 измењених фајлова са 5 додато и 6 уклоњено
  1. 4 5
      services/real-time/app.coffee
  2. 1 1
      services/real-time/config/settings.defaults.coffee

+ 4 - 5
services/real-time/app.coffee

@@ -96,15 +96,14 @@ shutdownCleanly = (signal) ->
 		, 10000
 		, 10000
 
 
 forceDrain = ->
 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 ()-> 
 	setTimeout ()-> 
 		logger.log "starting drain"
 		logger.log "starting drain"
 		DrainManager.startDrain(io, 4)
 		DrainManager.startDrain(io, 4)
-	, THREE_HOURS
+	, Settings.forceDrainMsDelay
 	
 	
-
-if Settings.delayExitUntilDrained
+if Settings.forceDrainMsDelay?
 	logger.log "drainBeforeShutdown enabled"
 	logger.log "drainBeforeShutdown enabled"
 	for signal in ['SIGINT', 'SIGHUP', 'SIGQUIT', 'SIGUSR1', 'SIGUSR2', 'SIGTERM', 'SIGABRT']
 	for signal in ['SIGINT', 'SIGHUP', 'SIGQUIT', 'SIGUSR1', 'SIGUSR2', 'SIGTERM', 'SIGABRT']
 		logger.log signal: signal, "received interrupt, cleaning up"
 		logger.log signal: signal, "received interrupt, cleaning up"

+ 1 - 1
services/real-time/config/settings.defaults.coffee

@@ -42,4 +42,4 @@ module.exports =
 	
 	
 	max_doc_length: 2 * 1024 * 1024 # 2mb
 	max_doc_length: 2 * 1024 * 1024 # 2mb
 
 
-	delayExitUntilDrained: process.env['DELAY_EXIT_UNTIL_DRAINED'] or false
+	forceDrainMsDelay: process.env['FORCE_DRAIN_MS_DELAY'] or false