Merge pull request #75 from overleaf/bg-clean-up-shutdown-code

clean up unused variable, convert setting to number
This commit is contained in:
Brian Gough 2019-08-15 10:00:32 +01:00 committed by GitHub
commit cfbc891175

View file

@ -121,8 +121,8 @@ shutdownCleanly = (signal) ->
Settings.shutDownInProgress = false
if Settings.shutdownDrainTimeWindow?
Settings.forceDrainMsDelay = parseInt(Settings.shutdownDrainTimeWindow, 10)
logger.log shutdownDrainTimeWindow: Settings.shutdownDrainTimeWindow,"shutdownDrainTimeWindow enabled"
shutdownDrainTimeWindow = parseInt(Settings.shutdownDrainTimeWindow, 10)
logger.log shutdownDrainTimeWindow: shutdownDrainTimeWindow,"shutdownDrainTimeWindow enabled"
for signal in ['SIGINT', 'SIGHUP', 'SIGQUIT', 'SIGUSR1', 'SIGUSR2', 'SIGTERM', 'SIGABRT']
process.on signal, ->
if Settings.shutDownInProgress
@ -130,8 +130,8 @@ if Settings.shutdownDrainTimeWindow?
return
else
Settings.shutDownInProgress = true
logger.log signal: signal, "received interrupt, starting drain over #{Settings.shutdownDrainTimeWindow} mins"
DrainManager.startDrainTimeWindow(io, Settings.shutdownDrainTimeWindow)
logger.log signal: signal, "received interrupt, starting drain over #{shutdownDrainTimeWindow} mins"
DrainManager.startDrainTimeWindow(io, shutdownDrainTimeWindow)
shutdownCleanly(signal)