From befb7c57d2f34196ccab399384fc8ac2fc2c0ddd Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Tue, 25 Mar 2025 03:35:16 +0200 Subject: PPC External Bridge Delay. --- .../PPC Installer-cache/cacheIndex.txt | Bin 52 -> 52 bytes .../Advanced Installer Projects/PPC Installer.aip | 231 ++++++++++++++++++++- .../ExternalBridge/PPCExternalBridgeService.cs | 7 +- .../PPCApplication/DefaultPPCApplicationManager.cs | 2 + .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- .../ExternalBridge/ExternalBridgeService.cs | 1 + 6 files changed, 238 insertions(+), 5 deletions(-) (limited to 'Software') diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt index 5fe5afe5a..a603ff06b 100644 Binary files a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt and b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt differ diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index 30f1da41a..9b76a7582 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -18,10 +18,10 @@ - + - + @@ -45,8 +45,25 @@ + + + + + + + + + + + + + + + + + @@ -80,9 +97,17 @@ + + + + + + + + @@ -111,6 +136,7 @@ + @@ -132,13 +158,17 @@ + + + + @@ -147,6 +177,7 @@ + @@ -154,8 +185,11 @@ + + + @@ -168,13 +202,18 @@ + + + + + @@ -200,6 +239,7 @@ + @@ -216,15 +256,23 @@ + + + + + + + + @@ -232,19 +280,25 @@ + + + + + + @@ -314,9 +368,25 @@ + + + + + + + + + + + + + + + + @@ -327,6 +397,7 @@ + @@ -713,6 +784,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -722,7 +893,7 @@ - + @@ -1104,6 +1275,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/ExternalBridge/PPCExternalBridgeService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/ExternalBridge/PPCExternalBridgeService.cs index 99951d812..133b7bb33 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/ExternalBridge/PPCExternalBridgeService.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/ExternalBridge/PPCExternalBridgeService.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Tango.BL.Entities; using Tango.Core.DI; using Tango.Core.Helpers; +using Tango.Core.Threading; using Tango.CSV; using Tango.Integration.ExternalBridge; using Tango.Integration.Operation; @@ -67,7 +68,11 @@ namespace Tango.PPC.Common.ExternalBridge SignalRConfiguration.Address = settings.DeploymentSlot.ToAddress(); } SignalRConfiguration.Hub = settings.ExternalBridgeSignalRHub; - Enabled = settings.EnableExternalBridge; + + TimeoutTask.StartNew(() => + { + Enabled = settings.EnableExternalBridge; + }, TimeSpan.FromMinutes(2)); }; } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs index ca20fe608..f980d9c22 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs @@ -272,6 +272,8 @@ namespace Tango.PPC.UI.PPCApplication { try { + settings.EnableProxifier = false; + Thread.Sleep(TimeSpan.FromMinutes(1)); LogManager.Log("Disabling Proxy..."); CmdCommand cmd = null; CmdCommandResult result = null; 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 21879667c..249a4ceb2 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("2.3.6.0")] +[assembly: AssemblyVersion("2.3.7.0")] diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs index ef66275cf..ccb0ef2a1 100644 --- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs +++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs @@ -630,6 +630,7 @@ namespace Tango.Integration.ExternalBridge _connection = new HubConnection(SignalRConfiguration.Address); _proxy = _connection.CreateHubProxy(SignalRConfiguration.Hub); _proxy.On("OnSessionCreated", OnSignalRSessionCreated); + _connection.TransportConnectTimeout = TimeSpan.FromMinutes(2); _connection.Start(); _connection.StateChanged += (x) => { -- cgit v1.3.1