Skip to content
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

Jump to bottom

stop using HystrixCollapser/reset-collapser #108

Merged
merged 1 commit into from
Feb 15, 2013
Merged

stop using HystrixCollapser/reset-collapser #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 1 addition & 9 deletions hystrix-contrib/hystrix-clj/src/main/clojure/com/netflix/hystrix/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,6 @@
HystrixCollapser$Setter
HystrixCollapser$CollapsedRequest]))

(declare reset-collapser)

(defmacro ^:private key-fn
"Make a function that creates keys of the given class given one of:

Expand Down Expand Up @@ -307,8 +305,7 @@

(defn collapser
"Helper function that takes a definition map for a HystrixCollapser and returns a normalized
version ready for use with execute and queue. It also ensures that global/cached collapser
state is reset.
version ready for use with execute and queue.

See ns documentation for valid keys.

Expand All @@ -319,7 +316,6 @@
(let [result (-> options-map
(assoc :type :collapser)
normalize)]
(reset-collapser (:collapser-key result))
result))

(defmacro defcollapser
Expand Down Expand Up @@ -519,10 +515,6 @@
;################################################################################
; :collapser impl

(defn- reset-collapser
[key]
(HystrixCollapser/resetCollapser (collapser-key key)))

(defmethod normalize :collapser
[definition]
(-> definition
Expand Down