Просмотр исходного кода

Merge pull request #89 from overleaf/bg-improve-shutdown-logging

improve shutdown logging
Brian Gough 6 лет назад
Родитель
Сommit
d12e056f08
1 измененных файлов с 5 добавлено и 6 удалено
  1. 5 6
      services/real-time/app.coffee

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

@@ -111,17 +111,17 @@ Error.stackTraceLimit = 10
 shutdownCleanly = (signal) ->
 	connectedClients = io.sockets.clients()?.length
 	if connectedClients == 0
-		logger.log("no clients connected, exiting")
+		logger.warn("no clients connected, exiting")
 		process.exit()
 	else
-		logger.log {connectedClients}, "clients still connected, not shutting down yet"
+		logger.warn {connectedClients}, "clients still connected, not shutting down yet"
 		setTimeout () ->
 			shutdownCleanly(signal)
-		, 10000
+		, 30 * 1000
 
 drainAndShutdown = (signal) ->
 	if Settings.shutDownInProgress
-		logger.log signal: signal, "shutdown already in progress, ignoring signal"
+		logger.warn signal: signal, "shutdown already in progress, ignoring signal"
 		return
 	else
 		Settings.shutDownInProgress = true
@@ -135,8 +135,7 @@ if Settings.shutdownDrainTimeWindow?
 	shutdownDrainTimeWindow = parseInt(Settings.shutdownDrainTimeWindow, 10)
 	logger.log shutdownDrainTimeWindow: shutdownDrainTimeWindow,"shutdownDrainTimeWindow enabled"
 	for signal in ['SIGINT', 'SIGHUP', 'SIGQUIT', 'SIGUSR1', 'SIGUSR2', 'SIGTERM', 'SIGABRT']
-		process.on signal, ->
-			drainAndShutdown(signal)
+		process.on signal, drainAndShutdown  # signal is passed as argument to event handler
 
 	# global exception handler
 	if Settings.errors?.catchUncaughtErrors