Move App/Transport async task to ClientConnection class

Azure · Oct 16, 2023 · 4c8092c · 4c8092c
1 parent cd929a9
commit 4c8092c
Show file tree

Hide file tree

Showing 7 changed files with 442 additions and 408 deletions.
diff --git a/src/Microsoft.Azure.SignalR.Common/Constants.cs b/src/Microsoft.Azure.SignalR.Common/Constants.cs
@@ -46,6 +46,9 @@ public static class Periods
             // Custom handshake timeout of SignalR Service
             public const int DefaultHandshakeTimeout = 15;
             public const int MaxCustomHandshakeTimeout = 30;
+
+            public static readonly TimeSpan DefaultServerHandshakeTimeout = TimeSpan.FromSeconds(15);
+            public static readonly TimeSpan DefaultClientHandshakeTimeout = TimeSpan.FromSeconds(15);
         }
 
         public static class ClaimType
@@ -102,6 +105,7 @@ public static class Headers
             public const string AsrsHeaderPrefix = "X-ASRS-";
             public const string AsrsServerId = AsrsHeaderPrefix + "Server-Id";
             public const string AsrsMessageTracingId = AsrsHeaderPrefix + "Message-Tracing-Id";
+            public const string AsrsIngressReloadMigrate = AsrsHeaderPrefix + "Ingress-Reload-Migrate";
             public const string MicrosoftErrorCode = "x-ms-error-code";
         }
 

diff --git a/src/Microsoft.Azure.SignalR.Common/ServiceConnections/ServiceConnectionBase.cs b/src/Microsoft.Azure.SignalR.Common/ServiceConnections/ServiceConnectionBase.cs
@@ -17,8 +17,6 @@ namespace Microsoft.Azure.SignalR
 {
     internal abstract class ServiceConnectionBase : IServiceConnection
     {
-        protected static readonly TimeSpan DefaultHandshakeTimeout = TimeSpan.FromSeconds(15);
-
         // Service ping rate is 5 sec to let server know service status. Set timeout for 30 sec for some space.
         private static readonly TimeSpan DefaultServiceTimeout = TimeSpan.FromSeconds(30);
 
@@ -389,7 +387,7 @@ protected virtual async Task<bool> HandshakeAsync(ConnectionContext context)
             using var cts = new CancellationTokenSource();
             if (!Debugger.IsAttached)
             {
-                cts.CancelAfter(DefaultHandshakeTimeout);
+                cts.CancelAfter(Constants.Periods.DefaultServerHandshakeTimeout);
             }
 
             if (await ReceiveHandshakeResponseAsync(context.Transport.Input, cts.Token))