Merge pull request #4653 from jefft0/fix/use-goroutine-to-call-Handle…

…AppMessage fix: In subscribeToMessages, use a goroutine to call HandleAppMessage
berty · Apr 13, 2023 · 9628a71 · 9628a71
2 parents 0f46cfb + 9626476
commit 9628a71
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/go/pkg/bertymessenger/subscriptions.go b/go/pkg/bertymessenger/subscriptions.go
@@ -235,13 +235,13 @@ func (svc *service) subscribeToMessages(ctx, tyberCtx context.Context, gpkb []by
  eventHandler = eventHandler.WithContext(tyber.ContextWithConstantTraceID(svc.eventHandler.Ctx(), "msgrcvd-"+cid.String()))
  }
 
- svc.handlerMutex.Lock()
- 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)...)
- }
- svc.handlerMutex.Unlock()
+ 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)...)
+  }
+ }()
  }
  }()
  return nil