Merge pull request #251 from seif/netstandard-timeouts

mythz · web-flow · commit 37c15798cd6e · 2019-10-31T21:38:07.000-05:00
Respect ConnectTimeout when in netstandard2
diff --git a/src/ServiceStack.Redis/RedisNativeClient_Utils.cs b/src/ServiceStack.Redis/RedisNativeClient_Utils.cs
@@ -92,17 +92,6 @@ private void Connect()
             };
             try
             {
-#if NETSTANDARD2_0
-                if (IPAddress.TryParse(Host, out var ip))
-                {
-                    socket.Connect(ip, Port);
-                }
-                else
-                {
-                    var addresses = Dns.GetHostAddressesAsync(Host).Result;
-                    socket.Connect(addresses.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork), Port);
-                }
-#else
                 if (ConnectTimeout <= 0)
                 {
                     socket.Connect(Host, Port);
@@ -114,7 +103,6 @@ private void Connect()
                         : socket.BeginConnect(Host, Port, null, null);
                     connectResult.AsyncWaitHandle.WaitOne(ConnectTimeout, true);
                 }
-#endif
 
                 if (!socket.Connected)
                 {

Original file line number	Diff line number	Diff line change
`@@ -92,17 +92,6 @@ private void Connect()`
`92`	`92`	`};`
`93`	`93`	`try`
`94`	`94`	`{`
`95`		`-#if NETSTANDARD2_0`
`96`		`- if (IPAddress.TryParse(Host, out var ip))`
`97`		`- {`
`98`		`- socket.Connect(ip, Port);`
`99`		`- }`
`100`		`- else`
`101`		`- {`
`102`		`- var addresses = Dns.GetHostAddressesAsync(Host).Result;`
`103`		`- socket.Connect(addresses.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork), Port);`
`104`		`- }`
`105`		`-#else`
`106`	`95`	`if (ConnectTimeout <= 0)`
`107`	`96`	`{`
`108`	`97`	`socket.Connect(Host, Port);`
`@@ -114,7 +103,6 @@ private void Connect()`
`114`	`103`	`: socket.BeginConnect(Host, Port, null, null);`
`115`	`104`	`connectResult.AsyncWaitHandle.WaitOne(ConnectTimeout, true);`
`116`	`105`	`}`
`117`		`-#endif`
`118`	`106`
`119`	`107`	`if (!socket.Connected)`
`120`	`108`	`{`