mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-12 15:01:38 +03:00
Merge pull request #4120 from urbit/la/fix-leave
group-on-leave: soften de-path to fix thread and add thread back to observe-hook state
This commit is contained in:
commit
d2f467912e
@ -64,6 +64,9 @@
|
||||
=| cards=(list card)
|
||||
|-
|
||||
?: ?=(%2 -.old-state)
|
||||
=. cards
|
||||
:_ cards
|
||||
(act [%watch %group-store /groups %group-on-leave])
|
||||
[cards this(state old-state)]
|
||||
?: ?=(%1 -.old-state)
|
||||
=. cards
|
||||
|
@ -486,7 +486,7 @@
|
||||
++ thread-fail
|
||||
|= [=yarn =term =tang]
|
||||
^- (quip card ^state)
|
||||
:: %- (slog leaf+"strand {<yarn>} failed" leaf+<term> tang)
|
||||
::%- (slog leaf+"strand {<yarn>} failed" leaf+<term> tang)
|
||||
=/ =tid (yarn-to-tid yarn)
|
||||
=/ fail-cards (thread-say-fail tid term tang)
|
||||
=^ cards state (thread-clean yarn)
|
||||
|
@ -80,15 +80,18 @@
|
||||
[%remove g.i.entries m.i.entries]
|
||||
:: archive graph associated with group
|
||||
::
|
||||
=/ app-resource (de-path-soft:res app-path.m.i.entries)
|
||||
?~ app-resource
|
||||
loop(entries t.entries)
|
||||
;< ~ bind:m
|
||||
%+ raw-poke
|
||||
[our.bowl %graph-store]
|
||||
:- %graph-update
|
||||
!> ^- update:gra
|
||||
[%0 now.bowl [%archive-graph (de-path:res app-path.m.i.entries)]]
|
||||
[%0 now.bowl [%archive-graph u.app-resource]]
|
||||
;< ~ bind:m
|
||||
%+ raw-poke
|
||||
[our.bowl %graph-pull-hook]
|
||||
:- %pull-hook-action
|
||||
!>([%remove (de-path:res app-path.m.i.entries)])
|
||||
!>([%remove u.app-resource])
|
||||
loop(entries t.entries)
|
||||
|
Loading…
Reference in New Issue
Block a user