Merge pull request #2742 from fuweid/bugfix_return_context_cancel_error_during_subcribe

dmcgowan · web-flow · commit c20c569a01a5 · 2018-10-24T16:13:41.000-07:00
bugfix: return the context error during event subscribe
diff --git a/events.go b/events.go
@@ -110,6 +110,9 @@ func (e *eventRemote) Subscribe(ctx context.Context, filters ...string) (ch <-ch
 				Event:     ev.Event,
 			}:
 			case <-ctx.Done():
+				if cerr := ctx.Err(); cerr != context.Canceled {
+					errq <- cerr
+				}
 				return
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,9 @@ func (e *eventRemote) Subscribe(ctx context.Context, filters ...string) (ch <-ch`
`110`	`110`	`Event: ev.Event,`
`111`	`111`	`}:`
`112`	`112`	`case <-ctx.Done():`
	`113`	`+ if cerr := ctx.Err(); cerr != context.Canceled {`
	`114`	`+ errq <- cerr`
	`115`	`+ }`
`113`	`116`	`return`
`114`	`117`	`}`
`115`	`118`	`}`