github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5978 from overleaf/bg-downgrade-errors-in-track-changes

Browse source 
[track-changes] downgrade consistency errors to warnings

GitOrigin-RevId: 6c4b27318fc97eb015de08f99978d1cab8f1da05
This commit is contained in:
Brian Gough 2021-12-01 16:25:18 +00:00 committed by Copybot
parent 88dabee6df
commit 8207197e33
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/track-changes/app/js/DiffGenerator.js
View file

@ -36,7 +36,7 @@ module.exports = DiffGenerator = {
if (e instanceof ConsistencyError && (i = update.op.length - 1)) {
// catch known case where the last op in an array has been
// merged into a later op
logger.error(
logger.warn(
{ err: e, update, op: JSON.stringify(op) },
'marking op as broken'
)

2
services/track-changes/app/js/ZipManager.js
View file

@ -85,7 +85,7 @@ async function rewindDoc(projectId, docId, zipfile) {
v = update.v
} catch (e) {
e.attempted_update = update // keep a record of the attempted update
logger.error({ projectId, docId, err: e }, 'rewind error')
logger.warn({ projectId, docId, err: e }, 'rewind error')
break // stop attempting to rewind on error
}