Bläddra i källkod

improve delay ms logging

Henry Oswald 7 år sedan
förälder
incheckning
b834049eeb
1 ändrade filer med 5 tillägg och 5 borttagningar
  1. 5 5
      services/real-time/app.coffee

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

@@ -96,17 +96,17 @@ shutdownCleanly = (signal) ->
 		, 10000
 		, 10000
 
 
 forceDrain = ->
 forceDrain = ->
-	forceDrainMsDelay = parseInt(Settings.forceDrainMsDelay, 10)
-	logger.log {delay_ms:forceDrainMsDelay}, "starting force drain after timeout"
+	logger.log {delay_ms:Settings.forceDrainMsDelay}, "starting force drain after timeout"
 	setTimeout ()-> 
 	setTimeout ()-> 
 		logger.log "starting drain"
 		logger.log "starting drain"
 		DrainManager.startDrain(io, 4)
 		DrainManager.startDrain(io, 4)
 	, Settings.forceDrainMsDelay
 	, Settings.forceDrainMsDelay
-	
+
 if Settings.forceDrainMsDelay?
 if Settings.forceDrainMsDelay?
-	logger.log "drainBeforeShutdown enabled"
+	Settings.forceDrainMsDelay = parseInt(Settings.forceDrainMsDelay, 10)
+	logger.log forceDrainMsDelay: Settings.forceDrainMsDelay,"forceDrainMsDelay 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"
 		process.on signal, ->
 		process.on signal, ->
+			logger.log signal: signal, "received interrupt, cleaning up"
 			shutdownCleanly(signal)
 			shutdownCleanly(signal)
 			forceDrain()
 			forceDrain()