urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-20 09:21:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

migration: undoing ship/src.bowl change, adding logging to imports

Browse Source
This commit is contained in:
Hunter Miller 2022-11-30 16:46:47 -06:00
parent 173b641df4
commit de1cdcefbb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/landscape/app/group-store.hoon
View File

@ -186,11 +186,10 @@
++ on-agent ++ on-agent
|= [=wire =sign:agent:gall] |= [=wire =sign:agent:gall]
^- (quip card _this) ^- (quip card _this)
~& src.bol
=^ cards state =^ cards state
?+ wire [- state]:(on-agent:def wire sign) ?+ wire [- state]:(on-agent:def wire sign)
[%pyre *] (take-pyre:gc t.wire sign) [%pyre *] (take-pyre:gc t.wire sign)
[%gladio @ ~] (take-migrate:gc (slav %p i.t.wire) sign) [%gladio @ ~] (take-migrate:gc sign)
:: ::
[%try-rejoin @ *] [%try-rejoin @ *]
?> ?=(%poke-ack -.sign) ?> ?=(%poke-ack -.sign)
@ -237,7 +236,6 @@
^- (quip card _state) ^- (quip card _state)
=^ cards-1=(list card) wait =^ cards-1=(list card) wait
~(migrate-start gladio bol) ~(migrate-start gladio bol)
~& wait
=/ cards-2=(list card) =/ cards-2=(list card)
%+ turn ~(tap in wait) %+ turn ~(tap in wait)
|= =ship |= =ship
@ -256,18 +254,18 @@
[%pass / %pyre leaf/"{<wire>} failed" u.p.sign]~ [%pass / %pyre leaf/"{<wire>} failed" u.p.sign]~
:: ::
++ take-migrate ++ take-migrate
|= [=ship =sign:agent:gall] |= =sign:agent:gall
^- (quip card _state) ^- (quip card _state)
~& [%migrating ship src.bol] ~& migrating/src.bol
?: ?=(%poke-ack -.sign) ?: ?=(%poke-ack -.sign)
`state `state
:_ state(wait (~(del in wait) ship)) :_ state(wait (~(del in wait) src.bol))
^- (list card) ^- (list card)
%+ welp (~(migrate-ship gladio bol) ship) %+ welp (~(migrate-ship gladio bol) src.bol)
?: ?=(%kick -.sign) :: TODO: check queued watches don't get kicked ?: ?=(%kick -.sign) :: TODO: check queued watches don't get kicked
*(list card) *(list card)
:_ *(list card) :_ *(list card)
[%pass /gladio/(scot %p ship) %agent [ship %groups] %leave ~] [%pass /gladio/(scot %p src.bol) %agent [src.bol %groups] %leave ~]
:: ::
++ peek-group ++ peek-group
|= rid=resource |= rid=resource

2
pkg/landscape/lib/gladio.hoon
View File

@ -144,6 +144,7 @@
heap-flags=(flag-importer %graph-validator-link) heap-flags=(flag-importer %graph-validator-link)
diary-flags=(flag-importer %graph-validator-publish) diary-flags=(flag-importer %graph-validator-publish)
== ==
~& [%to-import chat-flags]
=/ setup=(list card) =/ setup=(list card)
%+ welp (migrate-ship our.bowl) %+ welp (migrate-ship our.bowl)
:* (poke-our %groups group-import+!>(imports)) :* (poke-our %groups group-import+!>(imports))
@ -176,6 +177,7 @@
%. ~(key by links) %. ~(key by links)
=- ~(uni in -) =- ~(uni in -)
(~(uni in ~(key by chats)) ~(key by diarys)) (~(uni in ~(key by chats)) ~(key by diarys))
~& [%importing ~(key by chats)]
%+ welp %+ welp
%+ turn ~(tap in graph-flags) %+ turn ~(tap in graph-flags)
|= =flag:i |= =flag:i