Hayden Faulds 8 лет назад
Родитель
Сommit
0f87ae1f74

+ 2 - 5
services/document-updater/app/coffee/DocumentManager.coffee

@@ -89,11 +89,8 @@ module.exports = DocumentManager =
 							callback null
 							callback null
 					else
 					else
 						DocumentManager.flushAndDeleteDoc project_id, doc_id, (error) ->
 						DocumentManager.flushAndDeleteDoc project_id, doc_id, (error) ->
-							# Flush in the background since it requires a http request. We
-							# want to flush project history if the previous call only failed
-							# to delete the doc from Redis. There is no harm in flushing
-							# project history if the previous call failed to flush at all. So
-							# do this before checking errors.
+							# There is no harm in flushing project history if the previous
+							# call failed and sometimes it is required
 							HistoryManager.flushProjectChangesAsync project_id
 							HistoryManager.flushProjectChangesAsync project_id
 
 
 							return callback(error) if error?
 							return callback(error) if error?

+ 2 - 5
services/document-updater/app/coffee/HttpController.coffee

@@ -107,11 +107,8 @@ module.exports = HttpController =
 		timer = new Metrics.Timer("http.deleteDoc")
 		timer = new Metrics.Timer("http.deleteDoc")
 		DocumentManager.flushAndDeleteDocWithLock project_id, doc_id, (error) ->
 		DocumentManager.flushAndDeleteDocWithLock project_id, doc_id, (error) ->
 			timer.done()
 			timer.done()
-			# Flush in the background since it requires a http request. We
-			# want to flush project history if the previous call only failed
-			# to delete the doc from Redis. There is no harm in flushing
-			# project history if the previous call failed to flush at all. So
-			# do this before checking errors.
+			# There is no harm in flushing project history if the previous call
+			# failed and sometimes it is required
 			HistoryManager.flushProjectChangesAsync project_id
 			HistoryManager.flushProjectChangesAsync project_id
 
 
 			return next(error) if error?
 			return next(error) if error?

+ 2 - 4
services/document-updater/app/coffee/ProjectManager.coffee

@@ -59,10 +59,8 @@ module.exports = ProjectManager =
 
 
 			logger.log project_id: project_id, doc_ids: doc_ids, "deleting docs"
 			logger.log project_id: project_id, doc_ids: doc_ids, "deleting docs"
 			async.series jobs, () ->
 			async.series jobs, () ->
-				# Flush in the background since it requires a htpt request. If we
-				# flushed and deleted only some docs successfully then we should still
-				# flush project history. If no docs succeeded then there is still no
-				# harm flushing project history. So do this before checking errors.
+				# There is no harm in flushing project history if the previous call
+				# failed and sometimes it is required
 				HistoryManager.flushProjectChangesAsync project_id
 				HistoryManager.flushProjectChangesAsync project_id
 
 
 				if errors.length > 0
 				if errors.length > 0