Skip to content

Commit d44bf22

Browse files
Extract dns-resolver-group builder code into a separate function (#564)
* [dns] Extract dns-resolver-group builder code into a separate function * fixup! Redundant binding
1 parent a704e00 commit d44bf22

File tree

1 file changed

+36
-31
lines changed

1 file changed

+36
-31
lines changed

src/aleph/netty.clj

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -845,8 +845,9 @@
845845
(SingletonDnsServerAddressStreamProvider. (first addresses))
846846
(SequentialDnsServerAddressStreamProvider. ^Iterable addresses))))
847847

848-
(defn dns-resolver-group
849-
"Creates an instance of DnsAddressResolverGroup that might be set as a resolver to Bootstrap.
848+
(defn dns-resolver-group-builder
849+
"Creates an instance of DnsAddressResolverGroupBuilder that is used to configure and
850+
initialize an DnsAddressResolverGroup instance.
850851
851852
DNS options are a map of:
852853
@@ -895,35 +896,39 @@
895896
(let [^Class
896897
channel-type (if (and epoll? (epoll-available?))
897898
EpollDatagramChannel
898-
NioDatagramChannel)
899-
900-
b (cond-> (doto (DnsNameResolverBuilder.)
901-
(.channelType channel-type)
902-
(.maxPayloadSize max-payload-size)
903-
(.maxQueriesPerResolve max-queries-per-resolve)
904-
(.queryTimeoutMillis query-timeout)
905-
(.ttl min-ttl max-ttl)
906-
(.traceEnabled trace-enabled?)
907-
(.optResourceEnabled opt-resources-enabled?)
908-
(.ndots ndots)
909-
(.decodeIdn decode-idn?)
910-
(.recursionDesired recursion-desired?))
911-
912-
(some? address-types)
913-
(.resolvedAddressTypes (convert-address-types address-types))
914-
915-
(some? negative-ttl)
916-
(.negativeTtl negative-ttl)
917-
918-
(and (some? search-domains)
919-
(not (empty? search-domains)))
920-
(.searchDomains search-domains)
921-
922-
(and (some? name-servers)
923-
(not (empty? name-servers)))
924-
(.nameServerProvider ^DnsServerAddressStreamProvider
925-
(dns-name-servers-provider name-servers)))]
926-
(DnsAddressResolverGroup. b)))
899+
NioDatagramChannel)]
900+
(cond-> (doto (DnsNameResolverBuilder.)
901+
(.channelType channel-type)
902+
(.maxPayloadSize max-payload-size)
903+
(.maxQueriesPerResolve max-queries-per-resolve)
904+
(.queryTimeoutMillis query-timeout)
905+
(.ttl min-ttl max-ttl)
906+
(.traceEnabled trace-enabled?)
907+
(.optResourceEnabled opt-resources-enabled?)
908+
(.ndots ndots)
909+
(.decodeIdn decode-idn?)
910+
(.recursionDesired recursion-desired?))
911+
912+
(some? address-types)
913+
(.resolvedAddressTypes (convert-address-types address-types))
914+
915+
(some? negative-ttl)
916+
(.negativeTtl negative-ttl)
917+
918+
(and (some? search-domains)
919+
(not (empty? search-domains)))
920+
(.searchDomains search-domains)
921+
922+
(and (some? name-servers)
923+
(not (empty? name-servers)))
924+
(.nameServerProvider ^DnsServerAddressStreamProvider
925+
(dns-name-servers-provider name-servers)))))
926+
927+
(defn dns-resolver-group
928+
"Creates an instance of DnsAddressResolverGroup that might be set as a resolver to
929+
Bootstrap. The supported options are the same as to `dns-resolver-group-builder`."
930+
[dns-options]
931+
(DnsAddressResolverGroup. (dns-resolver-group-builder dns-options)))
927932

928933
(defn create-client
929934
([pipeline-builder

0 commit comments

Comments
 (0)