From 2009e374e82aa54c122d10f3c00a7defddab3a4c Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 5 Mar 2020 18:31:05 +0200 Subject: Fixed issue with job mixing. Fixed issue with LogViewer scroll and session logs. --- .../Tango.Integration/Operation/MachineOperator.cs | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs') diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 96c8e5ccf..9768498c6 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -2354,6 +2354,12 @@ namespace Tango.Integration.Operation ThreadFactory.StartNew(async () => { + if (handler.IsCanceled) + { + Status = MachineStatuses.ReadyToDye; + return; + } + Status = MachineStatuses.GettingReady; RunningJob = clonedJob; OnPrintingStarted(handler, clonedJob); @@ -2429,6 +2435,12 @@ namespace Tango.Integration.Operation LogManager.Log($"Job upload method is set to {JobUploadStrategy}..."); + if (handler.IsCanceled) + { + Status = MachineStatuses.ReadyToDye; + return; + } + var oldKeepAlive = UseKeepAlive; if (JobUploadStrategy == JobUploadStrategy.JobDescriptionFile) @@ -2449,9 +2461,21 @@ namespace Tango.Integration.Operation Message = "Uploading job description file...", }); + if (handler.IsCanceled) + { + Status = MachineStatuses.ReadyToDye; + return; + } + LogManager.Log("Creating storage API manager..."); var storage = CreateStorageManager(); + if (handler.IsCanceled) + { + Status = MachineStatuses.ReadyToDye; + return; + } + //Suppress keep alive while job uploads. //storage.SuppressKeepAliveWhileFileUploads = true; UseKeepAlive = false; //This is a work around for Shlomo not managing to keep alive while parsing the file. -- cgit v1.3.1