Skip to content

add explicit option to clients to enable/disable dns-caching #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 22, 2015
Merged

add explicit option to clients to enable/disable dns-caching #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee3ebd8
add support for disabling DNS-cache when creating TcpTransport
benfleis Jan 16, 2015
bec8d77
add udp support, and switch dumb name order
benfleis Jan 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions src/riemann/client.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
:key A PKCS8 key
:cert A PEM certificate
:ca-cert The signing cert for our certificate and the server's
:cache-dns? Allow DNS caching? (default: false)

Example:

Expand All @@ -143,8 +144,9 @@
tls?
key
cert
ca-cert]
:or {host "localhost"}} opts]
ca-cert
^Boolean cache-dns?]
:or {host "localhost", cache-dns? false}} opts]

; Check options
(when tls?
Expand All @@ -160,34 +162,40 @@
(doto (TcpTransport. host port)
(-> .sslContext
;; (.set (SSL/sslContext key cert ca-cert))
(.set (ssl/ssl-context key cert ca-cert)))))
(.set (ssl/ssl-context key cert ca-cert)))
(-> .cacheDns (.set cache-dns?))))

; Standard client
(RiemannClient/tcp host port))]
(doto (RiemannClient/tcp host port)
(-> .transport .cacheDns (.set cache-dns?))))]

; Attempt to connect lazily.
(try (connect! client)
(catch IOException e nil))
client)))

(defn ^RiemannClient udp-client
"Creates a new UDP client. Can take an optional maximum message size. Example:
"Creates a new UDP client. Can take an optional maximum message size, and
cache-dns? flag. Example:
(udp-client)
(udp-client {:host \"foo\" :port 5555 :max-size 16384})"
(udp-client {:host \"foo\" :port 5555 :max-size 16384 :cache-dns? true})"
[& opts]
(let [opts (if (and (= 1 (count opts))
(map? (first opts)))
(first opts)
(apply hash-map opts))
{:keys [^String host
^Integer port
^Integer max-size]
^Integer max-size
^Boolean cache-dns?]
:or {port 5555
host "localhost"
max-size 16384}} opts
max-size 16384
cache-dns? false}} opts
c (RiemannClient.
(doto (UdpTransport. host port)
(-> .sendBufferSize (.set max-size))))]
(-> .sendBufferSize (.set max-size))
(-> .transport .cacheDns (.set cache-dns?))))]
(try (connect! c)
(catch IOException e nil))
c))
Expand Down