aboutsummaryrefslogtreecommitdiffstats
path: root/Software
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-02-10 18:48:47 +0200
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-02-10 18:48:47 +0200
commitebc08ccd9085ff5e7687ac2af206c492b8084ae8 (patch)
treef7ff633bfe206c28cd797f7af81994fc1c72e261 /Software
parenta01a540f2f3465d6bb04db199949bb47462350bd (diff)
downloadTango-ebc08ccd9085ff5e7687ac2af206c492b8084ae8.tar.gz
Tango-ebc08ccd9085ff5e7687ac2af206c492b8084ae8.zip
Fixed external bridge not disconnecting on failed.
Reduced number of synchronization items per cycle.
Diffstat (limited to 'Software')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs6
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs2
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest2
-rw-r--r--Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs1
-rw-r--r--Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs2
-rw-r--r--Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs5
6 files changed, 12 insertions, 6 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs
index 675f55aa5..53e41062f 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs
@@ -79,9 +79,9 @@ namespace Tango.PPC.Common.Synchronization
StatusHistory = new SynchronizedObservableCollection<SynchronizationStatus>();
MaxJobs = 10;
- MaxJobRuns = 100;
- MaxMachinesEvents = 100;
- MaxOfflineUpdates = 50;
+ MaxJobRuns = 10;
+ MaxMachinesEvents = 10;
+ MaxOfflineUpdates = 10;
var settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
Interval = settings.SynchronizationInterval;
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index f5b3d427f..cfe0a03a0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 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/ExternalBridge/ExternalBridgeReceiver.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs
index 80b16f4d9..679e665f0 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs
@@ -196,6 +196,7 @@ namespace Tango.Integration.ExternalBridge
}
base.OnFailed(ex);
+ OnDisconnected();
}
public async override Task Disconnect()
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs
index 3458eed0b..312143c57 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs
@@ -287,7 +287,7 @@ namespace Tango.Integration.ExternalBridge
msg.ToBytes();
- toSend.ToList().ForEach(x => x.UpdateApplicationLogs(msg.Container));
+ toSend.ToList().Where(x => x.State == TransportComponentState.Connected).ToList().ForEach(x => x.UpdateApplicationLogs(msg.Container));
}
}
diff --git a/Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs b/Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs
index e838a6a05..fde08b968 100644
--- a/Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs
+++ b/Software/Visual_Studio/Tango.Transport/Web/WebTransportClient.cs
@@ -124,6 +124,11 @@ namespace Tango.Transport.Web
}
catch
{
+ if (message == null)
+ {
+ Logging.LogManager.Default.Log($"Error parsing response message!\n{data}");
+ }
+
throw new HttpRequestException(ex.Message + " " + message);
}