From bfdf14019ecafce63eb4d4f760e2b60b40421f06 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Wed, 1 Dec 2021 16:25:18 +0000 Subject: [PATCH] Merge pull request #5978 from overleaf/bg-downgrade-errors-in-track-changes [track-changes] downgrade consistency errors to warnings GitOrigin-RevId: 6c4b27318fc97eb015de08f99978d1cab8f1da05 --- services/track-changes/app/js/DiffGenerator.js | 2 +- services/track-changes/app/js/ZipManager.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/track-changes/app/js/DiffGenerator.js b/services/track-changes/app/js/DiffGenerator.js index 4d9c7a986f..aad3c7d625 100644 --- a/services/track-changes/app/js/DiffGenerator.js +++ b/services/track-changes/app/js/DiffGenerator.js @@ -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' ) diff --git a/services/track-changes/app/js/ZipManager.js b/services/track-changes/app/js/ZipManager.js index 192bcf5076..7a306a1cad 100644 --- a/services/track-changes/app/js/ZipManager.js +++ b/services/track-changes/app/js/ZipManager.js @@ -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 }