diff options
Diffstat (limited to 'Software')
4 files changed, 23 insertions, 16 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Telemetry/TelemetrySettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Telemetry/TelemetrySettings.cs index 7acf7e197..cf561eec9 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Telemetry/TelemetrySettings.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Telemetry/TelemetrySettings.cs @@ -48,12 +48,12 @@ namespace Tango.PPC.Common.Telemetry public TimeSpan DiagnosticsSamplingInterval { get; set; } = TimeSpan.FromSeconds(60); public bool SendEvents { get; set; } = true; public bool SendJobRuns { get; set; } = true; - public bool SendJobRunsHistory { get; set; } = true; + public bool SendJobRunsHistory { get; set; } = false; public bool SendJobStatus { get; set; } = true; public bool SendLogs { get; set; } = true; public bool SendMachineStatus { get; set; } = true; public bool SendMachineUpdates { get; set; } = true; - public bool SendMachineUpdatesHistory { get; set; } = true; + public bool SendMachineUpdatesHistory { get; set; } = false; public bool SendWires { get; set; } = true; public HashSet<LogCategory> LogCategories { get; set; } = new HashSet<LogCategory>() { LogCategory.Critical, LogCategory.Error, LogCategory.Warning }; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> + <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> </requestedPrivileges> </security> </trustInfo> diff --git a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs index 293e0bcc6..c29ec8319 100644 --- a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs +++ b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs @@ -318,23 +318,30 @@ namespace Tango.Integration.JobRuns //TODO: Needs to resubmit this to Azure! Then in Azure Distinct by job run ID, by job guid, by latest! - try + JobRunInfo jobRunInfo = null; + + if (CreateJobRunsFiles) { - String jobInfoPath = Path.Combine(JobRunsFolder, $"{run.ID}.run"); + try + { + String jobInfoPath = Path.Combine(JobRunsFolder, $"{run.ID}.run"); - if (File.Exists(jobInfoPath)) + if (File.Exists(jobInfoPath)) + { + String json = File.ReadAllText(jobInfoPath); + jobRunInfo = JsonConvert.DeserializeObject<JobRunInfo>(json); + jobRunInfo.Events.AddRange(_currentJobEvents.Select(x => MachinesEventDTO.FromObservable(x)).ToList()); + jobRunInfo.EndMachineStatus = MachineOperator.MachineStatus?.Clone(); + File.WriteAllText(jobInfoPath, jobRunInfo.ToJsonString()); + } + } + catch (Exception ex) { - String json = File.ReadAllText(jobInfoPath); - JobRunInfo info = JsonConvert.DeserializeObject<JobRunInfo>(json); - info.Events.AddRange(_currentJobEvents.Select(x => MachinesEventDTO.FromObservable(x)).ToList()); - info.EndMachineStatus = MachineOperator.MachineStatus?.Clone(); - File.WriteAllText(jobInfoPath, info.ToJsonString()); + LogManager.Log(ex, "Error while trying to update jobrun info file after job resume."); } } - catch (Exception ex) - { - LogManager.Log(ex, "Error while trying to update jobrun info file after job resume."); - } + + JobRunAvailable?.Invoke(this, new JobRunAvailableEventArgs() { JobRunInfo = jobRunInfo, JobRun = run }); } catch (Exception ex) { diff --git a/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryJobRunsStreamingSource.cs b/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryJobRunsStreamingSource.cs index b3199eb36..b539fae11 100644 --- a/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryJobRunsStreamingSource.cs +++ b/Software/Visual_Studio/Tango.Telemetry/Sources/TelemetryJobRunsStreamingSource.cs @@ -15,7 +15,7 @@ namespace Tango.Telemetry.Sources public string Name { get; } = "JobRuns Streaming"; - public bool RequiresTelemetryDuplicationTracking { get; } = true; + public bool RequiresTelemetryDuplicationTracking { get; } = false; public bool IsStarted { get; private set; } public event EventHandler<TelemetryAvailableEventArgs> TelemetryAvailable; |