status-im
/
reagent
mirror of https://github.com/status-im/reagent.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rethrow errors caught during try-run

This commit is contained in:
Dan Holmsand 2015-10-14 15:08:33 +02:00
parent 2d4500b61f
commit 54ecf706d5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/reagent/ratom.cljs
View File

@ -335,7 +335,8 @@
(deftype Reaction [f ^:mutable state ^:mutable ^boolean dirty? ^boolean nocache?
^:mutable watching ^:mutable watches ^:mutable auto-run]
^:mutable watching ^:mutable watches ^:mutable auto-run
^:mutable caught]
IAtom
IReactiveAtom
@ -394,9 +395,8 @@
(try
(._run this)
(catch :default e
;; Just log error: it will most likely pop up again at deref time.
(error "Error in reaction:" e)
(set! state nil)
(set! caught e)
(notify-w this e nil)))))
(_run [this]
@ -428,6 +428,9 @@
IDeref
(-deref [this]
(when-some [e caught]
(set! caught nil)
(throw e))
(let [non-reactive (nil? *ratom-context*)]
(when non-reactive
(flush!))
@ -467,7 +470,7 @@
(defn make-reaction [f & {:keys [auto-run on-set on-dispose]}]
(let [reaction (Reaction. f nil true false nil nil nil)]
(let [reaction (Reaction. f nil true false nil nil nil nil)]
(._set-opts reaction {:auto-run auto-run
:on-set on-set
:on-dispose on-dispose})