Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions event_log.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package sse

import (
"strconv"
"time"
)

// EventLog holds all of previous events
Expand All @@ -19,7 +18,6 @@ func (e *EventLog) Add(ev *Event) {
}

ev.ID = []byte(e.currentindex())
ev.timestamp = time.Now()
*e = append(*e, ev)
}

Expand Down
33 changes: 33 additions & 0 deletions http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,39 @@ func TestHTTPStreamHandlerEventTTL(t *testing.T) {
assert.Equal(t, []byte("test 3"), msg)
}

func TestHTTPStreamHandlerEventTTLNoReplay(t *testing.T) {
s := New()
defer s.Close()

s.EventTTL = time.Second * 1
s.AutoReplay = false

mux := http.NewServeMux()
mux.HandleFunc("/events", s.ServeHTTP)
server := httptest.NewServer(mux)

s.CreateStream("test")

c := NewClient(server.URL + "/events")
events := make(chan *Event)
var cErr error
go func() {
cErr = c.Subscribe("test", func(msg *Event) {
if len(msg.Data) > 0 {
events <- msg
}
})
}()

require.Nil(t, cErr)

time.Sleep(time.Millisecond * 100)
s.Publish("test", &Event{Data: []byte("test 1")})
msg, err := wait(events, time.Millisecond*500)
require.Nil(t, err)
assert.Equal(t, []byte("test 1"), msg)
}

func TestHTTPStreamHandlerHeaderFlushIfNoEvents(t *testing.T) {
s := New()
defer s.Close()
Expand Down
2 changes: 2 additions & 0 deletions stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"net/url"
"sync"
"sync/atomic"
"time"
)

// Stream ...
Expand Down Expand Up @@ -71,6 +72,7 @@ func (str *Stream) run() {

// Publish event to subscribers
case event := <-str.event:
event.timestamp = time.Now()
if str.AutoReplay {
str.Eventlog.Add(event)
}
Expand Down