From ebab7c0867a9772e68998e2055d0090f8f228150 Mon Sep 17 00:00:00 2001 From: badrAZ Date: Tue, 15 May 2018 16:10:17 +0200 Subject: [PATCH] fix(backup-ng/logs): handle the case when transfer/merge duration equals 0 (#2949) --- .../xo-server/src/xo-mixins/backups-ng/index.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/xo-server/src/xo-mixins/backups-ng/index.js b/packages/xo-server/src/xo-mixins/backups-ng/index.js index 68eb760ec..363b77a08 100644 --- a/packages/xo-server/src/xo-mixins/backups-ng/index.js +++ b/packages/xo-server/src/xo-mixins/backups-ng/index.js @@ -1328,11 +1328,16 @@ export default class BackupNg { case 'task.end': const task = logs[data.taskId] if (task !== undefined) { - task.status = data.status - task.taskId = data.taskId - task.result = data.result - task.end = time - task.duration = time - task.start + // work-around + if (time === task.start && message === 'merge') { + delete logs[data.taskId] + } else { + task.status = data.status + task.taskId = data.taskId + task.result = data.result + task.end = time + task.duration = time - task.start + } } } })