jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug Fix: Scheduled Task Status Updates

Browse Source 
Scheduled Task status is more reliable
This commit is contained in:
Gary Sharp
2014-06-02 20:02:48 +10:00
parent 5510d34885
commit ea51ba1f88
11 changed files with 184 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Config/Views/Shared/TaskStatus.cshtml
+33 -14
View File
@@ -30,6 +30,7 @@
<tr data-bind="visible: FinishedTimestamp() && !TaskExceptionMessage()">
<td class="finishedMessage" data-bind="css: { finishedRedirect: FinishedUrl }">
<span data-bind="text: FinishedMessage"></span>
<i class="fa fa-lg fa-cog fa-spin"></i>
</td>
</tr>
<tr data-bind="visible: TaskExceptionMessage">
@@ -99,6 +100,7 @@
var statusViewModel = function (sessionId) {
var self = this;
self.FullUpdateToken = null;
self.Initialized = ko.observable(false);
self.TimestampParse = function (timestamp) {
@@ -142,6 +144,11 @@
self.Finished = function () {
if (self.FinishedTimestamp()) {
if (self.FinishedUrl() && !self.TaskExceptionMessage()) {
if (self.FullUpdateToken)
window.clearTimeout(self.FullUpdateToken);
$.connection.hub.stop();
if (self.FinishedMessage())
window.setTimeout(function () { window.location.href = self.FinishedUrl(); }, 3000);
else
@@ -151,32 +158,33 @@
}
self.Initialize = function (taskStatus) {
if (!self.Initialized()) {
self.TaskName(taskStatus.TaskName);
self.FinishedUrl(taskStatus.FinishedUrl);
self.TaskName(taskStatus.TaskName);
self.FinishedUrl(taskStatus.FinishedUrl);
self.Progress(taskStatus.Progress);
self.CurrentProcess(taskStatus.CurrentProcess);
self.CurrentDescription(taskStatus.CurrentDescription);
self.Progress(taskStatus.Progress);
self.CurrentProcess(taskStatus.CurrentProcess);
self.CurrentDescription(taskStatus.CurrentDescription);
self.IsRunning(taskStatus.IsRunning);
self.IsRunning(taskStatus.IsRunning);
self.TaskExceptionMessage(taskStatus.TaskExceptionMessage);
self.TaskExceptionMessage(taskStatus.TaskExceptionMessage);
self.FinishedTimestamp(taskStatus.FinishedTimestamp);
self.NextScheduledTimestamp(taskStatus.NextScheduledTimestamp);
self.FinishedTimestamp(taskStatus.FinishedTimestamp);
self.NextScheduledTimestamp(taskStatus.NextScheduledTimestamp);
self.FinishedMessage(taskStatus.FinishedMessage);
self.FinishedMessage(taskStatus.FinishedMessage);
self.Initialized(true);
self.Initialized(true);
self.Finished();
}
self.Finished();
}
self.Update = function (taskStatus) {
if (!self.Initialized())
return;
if (self.FullUpdateToken)
window.clearTimeout(self.FullUpdateToken);
if (taskStatus) {
$.each(taskStatus, function (key, value) {
switch (key) {
@@ -213,6 +221,17 @@
}
});
}
if (!self.FinishedTimestamp())
self.FullUpdateToken = window.setTimeout(self.FullUpdate, 2000);
}
self.FullUpdate = function () {
self.FullUpdateToken = null;
if (!self.FinishedTimestamp())
notificationsHub.server.getStatus()
.done(self.Initialize);
}
}