aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.Integration/ExternalBridge
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-08-02 17:01:04 +0300
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-08-02 17:01:04 +0300
commit5cdd7a9dee347f212c137f792359aad6379404c8 (patch)
tree2bafdeb4718eda5126aefe70e4b67c7af12f726e /Software/Visual_Studio/Tango.Integration/ExternalBridge
parent10861ebf4891d02894a9cf6e8f94354067663765 (diff)
downloadTango-5cdd7a9dee347f212c137f792359aad6379404c8.tar.gz
Tango-5cdd7a9dee347f212c137f792359aad6379404c8.zip
Fixed ExternalBridgeSignal ApplicationVersion.
Fixed issue with FSE cached machine -> MachineVersion. Modified Remote embedded logs queue priority to low.
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration/ExternalBridge')
-rw-r--r--Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs8
-rw-r--r--Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeSignalRClient.cs4
-rw-r--r--Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeTcpClient.cs2
3 files changed, 10 insertions, 4 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs
index 3900eef69..08c397f5f 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeReceiver.cs
@@ -6,6 +6,7 @@ using System.Net.Sockets;
using System.Security.Authentication;
using System.Text;
using System.Threading.Tasks;
+using Tango.Core;
using Tango.Core.ExtensionMethods;
using Tango.Integration.Operation;
using Tango.PMR;
@@ -28,7 +29,7 @@ namespace Tango.Integration.ExternalBridge
/// This is used to bypass the safety operations confirmation.
/// FullName, Contact Time
/// </summary>
- public static Dictionary<String,DateTime> LastSafetyLevelContactsTimes { get; private set; }
+ public static Dictionary<String, DateTime> LastSafetyLevelContactsTimes { get; private set; }
#region Message Handler
@@ -560,7 +561,10 @@ namespace Tango.Integration.ExternalBridge
{
var cloned = container.Clone();
cloned.Token = _debugLogsToken;
- SendResponse(cloned);
+ SendResponse(cloned, new TransportResponseConfig()
+ {
+ Priority = QueuePriority.Low,
+ });
}
}
catch (Exception ex)
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeSignalRClient.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeSignalRClient.cs
index 51dc49ed0..df612ed96 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeSignalRClient.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeSignalRClient.cs
@@ -62,11 +62,13 @@ namespace Tango.Integration.ExternalBridge
if (login.RequireSafetyLevelOperations)
{
- timeout = TimeSpan.FromSeconds(30);
+ timeout = TimeSpan.FromSeconds(35);
}
var response = await SendRequest<ExternalBridgeLoginRequest, ExternalBridgeLoginResponse>(login, new TransportRequestConfig() { ShouldLog = true, Timeout = timeout });
+ ApplicationInformation = response.Message.ApplicationInformation;
+
SessionLogger.CreateSession();
DeviceInformation = response.Message.DeviceInformation;
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeTcpClient.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeTcpClient.cs
index e39210770..086b2bc7c 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeTcpClient.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeTcpClient.cs
@@ -93,7 +93,7 @@ namespace Tango.Integration.ExternalBridge
public ApplicationInformation ApplicationInformation
{
get { return _applicationInformation; }
- private set { _applicationInformation = value; RaisePropertyChangedAuto(); }
+ protected set { _applicationInformation = value; RaisePropertyChangedAuto(); }
}
#endregion