From fce6c97259bed45ea57f60143ebbdcd04873b799 Mon Sep 17 00:00:00 2001 From: James Mills Date: Tue, 5 Apr 2022 03:10:29 +0000 Subject: [PATCH] Upgrade to msgbus v0.1.18 (#153) Co-authored-by: James Mills Reviewed-on: https://git.mills.io/saltyim/saltyim/pulls/153 --- client.go | 3 +-- go.mod | 2 +- go.sum | 2 ++ internal/web/app.wasm | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client.go b/client.go index a6fe920..3f13e93 100644 --- a/client.go +++ b/client.go @@ -339,13 +339,12 @@ func (cli *Client) Subscribe(ctx context.Context, extraenvs, prehook, posthook s index := cli.state.GetIndex(inbox) + 1 // +1 to skip over the last seen message log.Debugf("streaming inbox %s from %d ...", inbox, index) s := bus.Subscribe(inbox, index, cli.messageHandler(extraenvs, prehook, posthook, msgs)) - s.Start() + go s.Run(ctx) log.Debugf("Connected to %s/%s", uri, inbox) go func() { <-ctx.Done() - s.Stop() close(msgs) }() diff --git a/go.mod b/go.mod index 61482f1..26dd1c0 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,7 @@ require ( require ( git.mills.io/prologic/bitcask v1.0.2 - git.mills.io/prologic/msgbus v0.1.17 + git.mills.io/prologic/msgbus v0.1.18 git.mills.io/prologic/observe v0.0.0-20210712230028-fc31c7aa2bd1 git.mills.io/prologic/useragent v0.0.0-20210714100044-d249fe7921a0 github.com/NYTimes/gziphandler v1.1.1 diff --git a/go.sum b/go.sum index 67634b3..fe809bd 100644 --- a/go.sum +++ b/go.sum @@ -48,6 +48,8 @@ git.mills.io/prologic/msgbus v0.1.16 h1:Pm+gIJwUITTpy+OTk3jtKb/fYvg7YkS+yUh7EAfF git.mills.io/prologic/msgbus v0.1.16/go.mod h1:ZFnDXoFvujU18Hv45pk0isCWAGjpkHpY9+/WSLzKJek= git.mills.io/prologic/msgbus v0.1.17 h1:ncQgq6z/KGmduk6H57n4TieYBY8JIh6pM5MECisb6GU= git.mills.io/prologic/msgbus v0.1.17/go.mod h1:ZFnDXoFvujU18Hv45pk0isCWAGjpkHpY9+/WSLzKJek= +git.mills.io/prologic/msgbus v0.1.18 h1:n6A6+fmrZnwduQE90TjZFXcxN9S1uLz0VDXmPFbCy3M= +git.mills.io/prologic/msgbus v0.1.18/go.mod h1:ZFnDXoFvujU18Hv45pk0isCWAGjpkHpY9+/WSLzKJek= git.mills.io/prologic/observe v0.0.0-20210712230028-fc31c7aa2bd1 h1:e6ZyAOFGLZJZYL2galNvfuNMqeQDdilmQ5WRBXCNL5s= git.mills.io/prologic/observe v0.0.0-20210712230028-fc31c7aa2bd1/go.mod h1:/rNXqsTHGrilgNJYH/8wsIRDScyxXUhpbSdNbBatAKY= git.mills.io/prologic/useragent v0.0.0-20210714100044-d249fe7921a0 h1:MojWEgZyiugUbgyjydrdSAkHlADnbt90dXyURRYFzQ4= diff --git a/internal/web/app.wasm b/internal/web/app.wasm index 96c947e..5580633 100755 --- a/internal/web/app.wasm +++ b/internal/web/app.wasm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:093b8f14002fea44c277ccf5b4aa51ec9d2ed2d0454a4c7c887c042eaecb3173 -size 29218116 +oid sha256:c59542f9c90c07badd3d37b17692ae909069d3d172a1bab97fab78dc41226970 +size 29225021