Преглед изворни кода

Merge pull request #16 from sharelatex/bg-handle-ops-after-delete

allow flush to succeed when doc is already deleted
Brian Gough пре 8 година
родитељ
комит
85de4f2bc5
1 измењених фајлова са 7 додато и 2 уклоњено
  1. 7 2
      services/document-updater/app/coffee/ProjectManager.coffee

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

@@ -20,10 +20,15 @@ module.exports = ProjectManager =
 				do (doc_id) ->
 					jobs.push (callback) ->
 						DocumentManager.flushDocIfLoadedWithLock project_id, doc_id, (error) ->
-							if error?
+							if error? and error instanceof Errors.NotFoundError
+								logger.warn err: error, project_id: project_id, doc_id: doc_id, "found deleted doc when flushing"
+								callback()
+							else if error?
 								logger.error err: error, project_id: project_id, doc_id: doc_id, "error flushing doc"
 								errors.push(error)
-							callback()
+								callback()
+							else
+								callback()
 
 			logger.log project_id: project_id, doc_ids: doc_ids, "flushing docs"
 			async.series jobs, () ->