Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:ztellman/lamina
Browse files Browse the repository at this point in the history
  • Loading branch information
ztellman committed Aug 7, 2014
2 parents be3e0d1 + f88bdd3 commit 365d0e6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/lamina/cache.clj
Expand Up @@ -18,7 +18,7 @@
(definterface+ IChannelCache
(get-or-create [cache id on-create]
"Gets a channel keyed to `id`. If `on-create` is non-nil and the entry must be created,
it will be called with zero parameters.
it will be called with the new channel as a parameter.
If the channel returned is closed, it will be implicitly removed from the cache.")
(ids [cache]
Expand Down
2 changes: 1 addition & 1 deletion src/lamina/core/named.clj
Expand Up @@ -19,7 +19,7 @@

(defn named-channel
"Returns a permanent channel keyed to `id`. If the channel doesn't already exist and `on-create` is non-nil,
it will be invoked with zero parameters."
it will be invoked with the new channel as a parameter."
[id on-create]
(cache/get-or-create named-channels id on-create))

Expand Down
2 changes: 1 addition & 1 deletion src/lamina/core/operators.clj
Expand Up @@ -724,7 +724,7 @@
(sink #(println \"average for\" facet-value \"is\" %))))})"
[{:keys [facet initializer on-clearance]}]
(let [receiver (g/node identity)
watch-channel (atom (fn [_]))
watch-channel (atom (fn [_ _]))
propagator (g/distributing-propagator facet
(fn [id]
(let [ch (channel* :description (pr-str id))]
Expand Down
6 changes: 3 additions & 3 deletions src/lamina/executor.clj
Expand Up @@ -26,10 +26,10 @@
value or error."
[& body]
(let [explicit-name? (string? (first body))
name (if explicit-name? (first body) "task")
name (symbol (if explicit-name? (first body) "task"))
body (if explicit-name? (rest body) body)]
`((trace/instrumented-fn
task
~name
{:executor default-executor}
[]
~@body))))
Expand All @@ -39,7 +39,7 @@
value or error. Unlike `task`, thread-local bindings are preserved when evaluating the body."
[& body]
(let [explicit-name? (string? (first body))
name (if explicit-name? (first body) "bound-task")
name (symbol (if explicit-name? (first body) "bound-task"))
body (if explicit-name? (rest body) body)]
`((trace/instrumented-fn
~name
Expand Down

0 comments on commit 365d0e6

Please sign in to comment.