From fbfe5f46f0ff2011d3a2d96cc1882824584f7b3c Mon Sep 17 00:00:00 2001 From: Logan Allen Date: Thu, 10 Dec 2020 13:46:42 -0600 Subject: [PATCH 1/3] spider: verbose --- pkg/arvo/app/spider.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/arvo/app/spider.hoon b/pkg/arvo/app/spider.hoon index 4da3089c1..6b58e1967 100644 --- a/pkg/arvo/app/spider.hoon +++ b/pkg/arvo/app/spider.hoon @@ -486,7 +486,7 @@ ++ thread-fail |= [=yarn =term =tang] ^- (quip card ^state) - :: %- (slog leaf+"strand {} failed" leaf+ tang) + %- (slog leaf+"strand {} failed" leaf+ tang) =/ =tid (yarn-to-tid yarn) =/ fail-cards (thread-say-fail tid term tang) =^ cards state (thread-clean yarn) From b281b9c91fb0d4379425407c5dad535c7c72893a Mon Sep 17 00:00:00 2001 From: Logan Allen Date: Thu, 10 Dec 2020 13:49:51 -0600 Subject: [PATCH 2/3] group-on-leave: soften de-path --- pkg/arvo/ted/group/on-leave.hoon | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/arvo/ted/group/on-leave.hoon b/pkg/arvo/ted/group/on-leave.hoon index 6bd00c4c6..b3e02ef35 100644 --- a/pkg/arvo/ted/group/on-leave.hoon +++ b/pkg/arvo/ted/group/on-leave.hoon @@ -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) From fe728fea35f56474e20eff1346d936053d72fe91 Mon Sep 17 00:00:00 2001 From: Logan Allen Date: Thu, 10 Dec 2020 13:55:14 -0600 Subject: [PATCH 3/3] observe-hook: add %group-on-leave back to observers --- pkg/arvo/app/observe-hook.hoon | 3 +++ pkg/arvo/app/spider.hoon | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/arvo/app/observe-hook.hoon b/pkg/arvo/app/observe-hook.hoon index 0d69d4760..b1d8b47ba 100644 --- a/pkg/arvo/app/observe-hook.hoon +++ b/pkg/arvo/app/observe-hook.hoon @@ -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 diff --git a/pkg/arvo/app/spider.hoon b/pkg/arvo/app/spider.hoon index 6b58e1967..72aad4355 100644 --- a/pkg/arvo/app/spider.hoon +++ b/pkg/arvo/app/spider.hoon @@ -486,7 +486,7 @@ ++ thread-fail |= [=yarn =term =tang] ^- (quip card ^state) - %- (slog leaf+"strand {} failed" leaf+ tang) + ::%- (slog leaf+"strand {} failed" leaf+ tang) =/ =tid (yarn-to-tid yarn) =/ fail-cards (thread-say-fail tid term tang) =^ cards state (thread-clean yarn)