From 775f5ebbe1b6b47c5e491c04be6f356e2e67d787 Mon Sep 17 00:00:00 2001
From: Brian Gough <bjg@network-theory.co.uk>
Date: Fri, 5 Jun 2015 13:38:47 +0100
Subject: [PATCH] add configurable limit, delay and timeout to /pack via query
 string

---
 services/track-changes/app.coffee             |  3 ++-
 .../app/coffee/PackWorker.coffee              | 23 ++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/services/track-changes/app.coffee b/services/track-changes/app.coffee
index b0ae08dca5..8d5fd9c082 100644
--- a/services/track-changes/app.coffee
+++ b/services/track-changes/app.coffee
@@ -34,7 +34,8 @@ app.post "/pack", (req, res, next) ->
 		res.send "pack already running"
 	else
 		logger.log "running pack"
-		packWorker = child_process.fork(__dirname + '/app/js/PackWorker.js')
+		packWorker = child_process.fork(__dirname + '/app/js/PackWorker.js',
+			[req.query.limit, req.query.delay, req.query.timeout])
 		packWorker.on 'exit', (code, signal) ->
 			logger.log {code, signal}, "history auto pack exited"
 			packWorker = null
diff --git a/services/track-changes/app/coffee/PackWorker.coffee b/services/track-changes/app/coffee/PackWorker.coffee
index 8366343de5..c9076c268d 100644
--- a/services/track-changes/app/coffee/PackWorker.coffee
+++ b/services/track-changes/app/coffee/PackWorker.coffee
@@ -10,9 +10,23 @@ PackManager = require "./PackManager"
 # this worker script is forked by the main process to look for
 # document histories which can be packed
 
-DOCUMENT_PACK_DELAY = 1000
+LIMIT = Number(process.argv[2]) || 1000
+DOCUMENT_PACK_DELAY = Number(process.argv[3]) || 1000
+TIMEOUT = Number(process.argv[4]) || 30*60*1000
 
-logger.log 'checking for updates'
+shutDownRequested = false
+setTimeout () ->
+	logger.log "pack timed out, requesting shutdown"
+	# start the shutdown on the next pack
+	shutDownRequested = true
+	# do a hard shutdown after a further 5 minutes
+	setTimeout () ->
+		logger.error "HARD TIMEOUT in pack worker"
+		process.exit()
+	, 5*60*1000
+, TIMEOUT
+
+logger.log "checking for updates, limit=#{LIMIT}, delay=#{DOCUMENT_PACK_DELAY}, timeout=#{TIMEOUT}"
 
 finish = () ->
 	logger.log 'closing db'
@@ -26,6 +40,9 @@ processUpdates = (pending) ->
 			if err?
 				logger.error {err, result}, "error in pack worker"
 				return callback(err)
+			if shutDownRequested
+				logger.error "shutting down pack worker"
+				return callback(new Error("shutdown"))
 			setTimeout () ->
 				callback(err, result)
 			, DOCUMENT_PACK_DELAY
@@ -41,7 +58,7 @@ db.docHistoryStats.find({
 	update_count: {$gt : PackManager.MIN_COUNT}
 }).sort({
 	update_count:-1
-}).limit 1000, (err, results) ->
+}).limit LIMIT, (err, results) ->
 	if err?
 		logger.log {err}, 'error checking for updates'
 		finish()