haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5282 from duplicati/feature/improved-task-when-completes

Browse Source 
Separating the timers and callbacks
This commit is contained in:
Kenneth Skovhede
2024-07-19 13:40:46 +02:00
committed by GitHub
parent 2f26f52a30 9cd94bba2a
commit abe37e7e33
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Server/webroot/ngax/scripts/services/ServerStatus.js
+6 -5
View File
@@ -122,11 +122,13 @@ backupApp.service('ServerStatus', function ($rootScope, $timeout, AppService, Ap
this.callWhenTaskCompletes = function (taskid, callback) {
if (waitingfortask[taskid] == null)
{
waitingfortask[taskid] = [];
// Guard against cases where the taks state is incorrectly reported
// This happens on really fast completion, and also sometimes on longer running tasks
waitingfortask[taskid].push(callback);
// Guard against cases where the taks state is incorrectly reported
// This happens on really fast completion, and also sometimes on longer running tasks
if (waitingfortaskTimers[taskid] == null) {
waitingfortaskTimers[taskid] = window.setInterval(() => {
if (waitingfortask[taskid] == null)
{
@@ -141,8 +143,7 @@ backupApp.service('ServerStatus', function ($rootScope, $timeout, AppService, Ap
checkTaskState(taskid);
}, 1000);
}
waitingfortask[taskid].push(callback);
};
// This appears to be broken, and causes the UI to hang