Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add EventSource support #11235

Merged
merged 17 commits into from
May 7, 2020
Merged

Add EventSource support #11235

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f5bee59
Add event-stream support
zeripath Apr 24, 2020
5613a2e
placate lint
zeripath Apr 28, 2020
16fffa6
Add basic eventsource integration test
zeripath Apr 28, 2020
4fe5225
Merge remote-tracking branch 'origin/master' into event-source
zeripath Apr 29, 2020
5dac802
As per @silverwind
zeripath Apr 29, 2020
2fe0bff
Remove origin checks
zeripath Apr 29, 2020
ecf33c0
Apply suggestions from code review
zeripath May 1, 2020
016de67
Apply suggestions from code review
zeripath May 1, 2020
eb27ec5
Apply suggestions from code review
zeripath May 1, 2020
deff11f
Apply suggestions from code review
zeripath May 1, 2020
1ab0f8c
Fix delayed check
zeripath May 1, 2020
05e8f33
Remove CORS line - it is dealt with elsewhere
zeripath May 4, 2020
d36f6da
Simplify GetUIDsAndNotificationCounts
zeripath May 4, 2020
929ad3f
Update models/notification.go
techknowlogick May 5, 2020
5315e49
Apply suggestions from code review
zeripath May 7, 2020
8b023ac
Merge branch 'master' into event-source
zeripath May 7, 2020
dbd30fb
Merge branch 'master' into event-source
zeripath May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
placate lint 
Signed-off-by: Andrew Thornton <[email protected]>
  • Loading branch information
@zeripath
zeripath committed Apr 28, 2020
commit 5613a2ef82bad1990ab6cb3cc1fa7883075f1ab9
3 changes: 3 additions & 0 deletions modules/eventsource/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ func (e *Event) WriteTo(w io.Writer) (int64, error) {
if e.Retry != 0 {
nint, err = fmt.Fprintf(w, "retry: %d\n", int64(e.Retry/time.Millisecond))
sum += int64(nint)
if err != nil {
return sum, err
}
}

nint, err = w.Write([]byte("\n"))
Expand Down
2 changes: 1 addition & 1 deletion routers/events/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func Events(ctx *context.Context) {
ctx.Resp.WriteHeader(http.StatusOK)

// Listen to connection close and un-register messageChan
notify := ctx.Resp.(http.CloseNotifier).CloseNotify()
notify := ctx.Req.Context().Done()
ctx.Resp.Flush()

shutdownCtx := graceful.GetManager().ShutdownContext()
Expand Down