Skip to content

Commit 25cae83

Browse files
authored
Merge pull request #241 from cnblogs/use-dnsendpoint
refactor: use DnsEndPoint
2 parents 5afe0c6 + 4fa29cf commit 25cae83

File tree

1 file changed

+5
-20
lines changed

1 file changed

+5
-20
lines changed

src/Enyim.Caching/Configuration/MemcachedClientConfiguration.cs

+5-20
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
using Microsoft.Extensions.Options;
88
using System;
99
using System.Collections.Generic;
10-
using System.Linq;
1110
using System.Net;
1211
using System.Net.Security;
13-
using System.Net.Sockets;
1412

1513
namespace Enyim.Caching.Configuration
1614
{
@@ -208,7 +206,7 @@ public MemcachedClientConfiguration(
208206

209207
private void ConfigureServers(MemcachedClientOptions options)
210208
{
211-
Servers = new List<EndPoint>();
209+
Servers = [];
212210
foreach (var server in options.Servers)
213211
{
214212
if (options.UseSslStream)
@@ -217,29 +215,16 @@ private void ConfigureServers(MemcachedClientOptions options)
217215
}
218216
else
219217
{
220-
if (!IPAddress.TryParse(server.Address, out var address))
218+
if (IPAddress.TryParse(server.Address, out var address))
221219
{
222-
address = Dns.GetHostAddresses(server.Address)
223-
.FirstOrDefault(i =>
224-
i.AddressFamily == (options.UseIPv6
225-
? AddressFamily.InterNetworkV6
226-
: AddressFamily.InterNetwork));
227-
228-
if (address == null)
229-
{
230-
_logger.LogError($"Could not resolve host '{server.Address}'.");
231-
}
232-
else
233-
{
234-
_logger.LogInformation($"Memcached server address - {address}");
235-
}
220+
Servers.Add(new IPEndPoint(address, server.Port));
236221
}
237222
else
238223
{
239-
_logger.LogInformation($"Memcached server address - {server.Address}:{server.Port}");
224+
AddServer(server.Address, server.Port);
240225
}
241226

242-
Servers.Add(new IPEndPoint(address, server.Port));
227+
_logger.LogInformation("Memcached server address - {address}:{port}", server.Address, server.Port);
243228
}
244229
}
245230
}

0 commit comments

Comments
 (0)