Merge pull request #2809 from HusterWan/zr/octet-stream-fix

refactor: no need so many defer in closeAll function
2018-11-20 06:23:30 +08:00 · 2018-11-20 06:23:30 +08:00 · f801661dcf
commit f801661dcf
parent aa537a67b3 9639db5522
1 changed files with 4 additions and 4 deletions
--- a/events/exchange/exchange.go
+++ b/events/exchange/exchange.go
@ -138,10 +138,10 @@ func (e *Exchange) Subscribe(ctx context.Context, fs ...string) (ch <-chan *even
 	)

 	closeAll := func() {
-		defer close(errq)
-		defer e.broadcaster.Remove(dst)
-		defer queue.Close()
-		defer channel.Close()
+		channel.Close()
+		queue.Close()
+		e.broadcaster.Remove(dst)
+		close(errq)
 	}

 	ch = evch