fix: Use weshnet v1.10.0 to fix the message queue. Call HandleAppMess…

…age without goroutine. Signed-off-by: Jeff Thompson <jeff@thefirst.org>
berty · Jun 12, 2023 · e51fe80 · e51fe80
1 parent f5ef325
commit e51fe80
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	berty.tech/go-ipfs-repo-encrypted v1.3.0
 	berty.tech/go-orbit-db v1.22.0
 	berty.tech/ipfs-webui-packed v1.0.0-v2.11.4-1
-	berty.tech/weshnet v1.8.0
+	berty.tech/weshnet v1.10.0
 	fyne.io/fyne/v2 v2.1.1
 	github.com/Masterminds/semver v1.5.0
 	github.com/appleboy/go-fcm v0.1.5

diff --git a/go.sum b/go.sum
diff --git a/go/pkg/bertymessenger/subscriptions.go b/go/pkg/bertymessenger/subscriptions.go
@@ -235,13 +235,11 @@ func (svc *service) subscribeToMessages(ctx, tyberCtx context.Context, gpkb []by
 				eventHandler = eventHandler.WithContext(tyber.ContextWithConstantTraceID(svc.eventHandler.Ctx(), "msgrcvd-"+cid.String()))
 			}
 
-			go func() {
-				if err := eventHandler.HandleAppMessage(messengerutil.B64EncodeBytes(gpkb), gme, &am); err != nil {
-					_ = tyber.LogFatalError(eventHandler.Ctx(), eventHandler.Logger(), "Failed to handle AppMessage", err)
-				} else {
-					eventHandler.Logger().Debug("AppMessage handler succeeded", tyber.FormatStepLogFields(eventHandler.Ctx(), []tyber.Detail{}, tyber.EndTrace)...)
-				}
-			}()
+			if err := eventHandler.HandleAppMessage(messengerutil.B64EncodeBytes(gpkb), gme, &am); err != nil {
+				_ = tyber.LogFatalError(eventHandler.Ctx(), eventHandler.Logger(), "Failed to handle AppMessage", err)
+			} else {
+				eventHandler.Logger().Debug("AppMessage handler succeeded", tyber.FormatStepLogFields(eventHandler.Ctx(), []tyber.Detail{}, tyber.EndTrace)...)
+			}
 		}
 	}()
 	return nil