mirror of
https://github.com/urbit/shrub.git
synced 2024-12-02 21:34:04 +03:00
Merge pull request #6595 from urbit/jb/stir-ames-rift
ames: add %rift to %stir
This commit is contained in:
commit
58aed9ccfa
@ -1755,6 +1755,20 @@
|
|||||||
++ on-stir
|
++ on-stir
|
||||||
|= arg=@t
|
|= arg=@t
|
||||||
^+ event-core
|
^+ event-core
|
||||||
|
|^ ?+ arg do-stir
|
||||||
|
%rift do-rift
|
||||||
|
==
|
||||||
|
::
|
||||||
|
++ do-rift
|
||||||
|
=/ =rift
|
||||||
|
=- ~|(%no-rift (,@ q.q:(need (need -))))
|
||||||
|
(rof ~ %j `beam`[[our %rift %da now] /(scot %p our)])
|
||||||
|
?: =(rift rift.ames-state)
|
||||||
|
event-core
|
||||||
|
~& "ames: fixing rift from {<rift.ames-state>} to {<rift>}"
|
||||||
|
event-core(ames-state ames-state(rift rift))
|
||||||
|
::
|
||||||
|
++ do-stir
|
||||||
=/ want=(set [@da ^duct])
|
=/ want=(set [@da ^duct])
|
||||||
%- ~(rep by peers.ames-state)
|
%- ~(rep by peers.ames-state)
|
||||||
|= [[who=ship s=ship-state] acc=(set [@da ^duct])]
|
|= [[who=ship s=ship-state] acc=(set [@da ^duct])]
|
||||||
@ -1790,6 +1804,7 @@
|
|||||||
|= [[wen=@da hen=^duct] this=_event-core]
|
|= [[wen=@da hen=^duct] this=_event-core]
|
||||||
?> ?=([^ *] hen)
|
?> ?=([^ *] hen)
|
||||||
(emit:this t.hen %pass t.i.hen %b %rest wen)
|
(emit:this t.hen %pass t.i.hen %b %rest wen)
|
||||||
|
--
|
||||||
:: +on-crud: handle event failure; print to dill
|
:: +on-crud: handle event failure; print to dill
|
||||||
::
|
::
|
||||||
++ on-crud
|
++ on-crud
|
||||||
|
Loading…
Reference in New Issue
Block a user