agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-28 19:41:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #483 from sharelatex/ja-dont-fail-on-tpdsworker-error

Browse Source 
Continuing flushing document on tpds worker error
This commit is contained in:
Henry Oswald
2017-04-25 09:19:13 +01:00
committed by GitHub
parent 5d55e383c7 6d2f18016f
commit 3bdd5a4a2e
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
View File

@@ -138,8 +138,7 @@ module.exports = ProjectEntityHandler =
project_name: project.name,
rev: 0
}, (err) ->
if err?
logger.err err:err, "error adding doc to tpdsworker, contining anyway"
return callback(err) if err?
callback(null, doc, folder_id)
restoreDoc: (project_id, doc_id, name, callback = (error, doc, folder_id) ->) ->
@@ -170,9 +169,8 @@ module.exports = ProjectEntityHandler =
if err?
logger.err err:err, project_id: project._id, folder_id: folder_id, file_name: fileName, fileRef:fileRef, "error adding file with project"
return callback(err)
tpdsUpdateSender.addFile {project_id:project._id, file_id:fileRef._id, path:result?.path?.fileSystem, project_name:project.name, rev:fileRef.rev}, (err)->
if err?
logger.err err:err, project_id: project._id, folder_id: folder_id, file_name: fileName, fileRef:fileRef, "error sending file to tpdsworker"
tpdsUpdateSender.addFile {project_id:project._id, file_id:fileRef._id, path:result?.path?.fileSystem, project_name:project.name, rev:fileRef.rev}, (err) ->
return callback(err) if err?
callback(null, fileRef, folder_id)
replaceFile: (project_id, file_id, fsPath, callback)->

4
services/web/app/coffee/Features/ThirdPartyDataStore/TpdsUpdateSender.coffee
View File

@@ -35,8 +35,8 @@ module.exports = TpdsUpdateSender =
timeout: (5 * 1000)
request opts, (err)->
if err?
logger.err err:err, "error queuing something in the tpdsworker"
callback(err)
logger.err err:err, "error queuing something in the tpdsworker, continuing anyway"
callback()
else
logger.log group:group, "successfully queued up job for tpdsworker"
callback()