From e20ed5dc326911408f926930aafe70f503be2c29 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Fri, 16 Oct 2020 16:46:39 +0300 Subject: [PATCH] fix sub ctx Signed-off-by: Vasiliy Tolstov --- http.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/http.go b/http.go index 7fb604e..b9cc0d0 100644 --- a/http.go +++ b/http.go @@ -230,10 +230,11 @@ func (h *httpServer) Deregister() error { subCtx := h.opts.Context for sb, subs := range h.subscribers { + if cx := sb.Options().Context; cx != nil { + subCtx = cx + } + for _, sub := range subs { - if cx := sb.Options().Context; cx != nil { - subCtx = cx - } logger.Infof("Unsubscribing from topic: %s", sub.Topic()) if err := sub.Unsubscribe(subCtx); err != nil { logger.Errorf("failed to unsubscribe topic: %s, error: %v", sb.Topic(), err)