luciano/mount
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

:on-reload :noop should not leave stale references

Browse source
This commit is contained in:
anatoly 2017-04-06 23:33:27 -04:00
parent 095eb81488
commit 4d961b56c0
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/mount/core.cljc
View file

@ -139,6 +139,13 @@
(or (-> s-var meta :on-reload) (or (-> s-var meta :on-reload)
:restart)) ;; restart by default on ns reload :restart)) ;; restart by default on ns reload
(defn running-noop? [s-name]
(let [{:keys [var status]} (@meta-state s-name)
on-reload (-> var meta :on-reload)]
(when status
(and (status :started)
(= :noop on-reload)))))
;;TODO: make private after figuring out the inconsistency betwen cljs compile stages ;;TODO: make private after figuring out the inconsistency betwen cljs compile stages
;; (i.e. _sometimes_ this, if private, is not seen by expanded "defmacro" on cljs side) ;; (i.e. _sometimes_ this, if private, is not seen by expanded "defmacro" on cljs side)
(defn mount-it [s-var s-name s-meta] (defn mount-it [s-var s-name s-meta]
@ -158,16 +165,20 @@
{:keys [start stop] :as lifecycle} (apply hash-map params) {:keys [start stop] :as lifecycle} (apply hash-map params)
state-name (with-ns *ns* state) state-name (with-ns *ns* state)
order (make-state-seq state-name)] order (make-state-seq state-name)]
(validate lifecycle) (validate lifecycle)
(let [s-meta (cond-> {:order order (let [s-meta (cond-> {:order order
:start `(fn [] ~start) :start `(fn [] ~start)
:status #{:stopped}} :status #{:stopped}}
stop (assoc :stop `(fn [] ~stop)))] stop (assoc :stop `(fn [] ~stop)))]
`(do `(do
;; (log (str "|| mounting... " ~state-name)) ;; (log (str "|| mounting... " ~state-name))
(~'defonce ~state (DerefableState. ~state-name)) ;; only create/redefine a new state iff this is not a running ^{:on-reload :noop}
(mount-it (~'var ~state) ~state-name ~s-meta) (if-not (running-noop? ~state-name)
(~'var ~state)))))) (do
(~'defonce ~state (DerefableState. ~state-name))
(mount-it (~'var ~state) ~state-name ~s-meta))
(~'defonce ~state (current-state ~state-name)))
(~'var ~state))))))
#?(:clj #?(:clj
(defmacro defstate! [state & {:keys [start! stop!]}] (defmacro defstate! [state & {:keys [start! stop!]}]

5
test/core/mount/test/on_reload.cljc
View file

@ -35,8 +35,9 @@
(require 'mount.test.on-reload-helper :reload) (require 'mount.test.on-reload-helper :reload)
;; "a" is marked as :noop on reload ;; "a" is marked as :noop on reload
(is (instance? mount.core.NotStartedState (dval a))) ;; (!) stale reference of old a is still there somewhere ;; previous behavior left a stale reference =>>> ;; (is (instance? mount.core.NotStartedState (dval a))) ;; (!) stale reference of old a is still there somewhere
(is (= (-> pre-reload :a) (is (= :started (dval a))) ;; make sure a still has the same instance as before reload
(is (= (-> pre-reload :a) ;; and the start was not called: the counter did not change
(-> @counter :a))) (-> @counter :a)))
;; "b" is marked as :stop on reload ;; "b" is marked as :stop on reload