Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'perf' of github.com:ztellman/lamina into perf

Conflicts:
	src/lamina/trace/instrument.clj
  • Loading branch information...
commit 060f700c7b7c4226a198ff9ec6198e540ff7b0fb 2 parents 38274a2 + 2aed627
@ztellman authored
Showing with 8 additions and 8 deletions.
  1. +2 −2 src/lamina/connections.clj
  2. +6 −6 src/lamina/trace/instrument.clj
View
4 src/lamina/connections.clj
@@ -116,7 +116,7 @@
:or {timeout 5000
interval 10000}
:as heartbeat} (:heartbeat options)]
-
+
(when-not (contains? heartbeat :request)
(throw (IllegalArgumentException. "heartbeat must specify :request")))
@@ -142,7 +142,7 @@
(defn try-instrument [options f]
(if (contains? options :name)
(with-meta
- (apply instrument f (apply concat options))
+ (instrument f options)
(meta f))
f))
View
12 src/lamina/trace/instrument.clj
@@ -38,11 +38,11 @@
~(when timeout `(when ~timeout (~timeout ~args)))))))
(defn instrument-task
- [f & {:keys [executor capture timeout implicit? with-bindings?]
- :as options
- :or {implicit? true
- capture :in-out
- with-bindings? false}}]
+ [f {:keys [executor capture timeout implicit? with-bindings?]
+ :as options
+ :or {implicit? true
+ capture :in-out
+ with-bindings? false}}]
(let [nm (name (:name options))
enter-probe (probe-channel [nm :enter])
return-probe (probe-channel [nm :return])
@@ -173,7 +173,7 @@
(when-not (contains? options :name)
(throw (IllegalArgumentException. "Instrumented functions must have a :name defined.")))
(if executor
- (apply instrument-task f (apply concat options))
+ (instrument-task f options)
(let [nm (name (:name options))
enter-probe (probe-channel [nm :enter])
return-probe (probe-channel [nm :return])
Please sign in to comment.
Something went wrong with that request. Please try again.