neoris/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix restoring empty session history

Browse Source
This commit is contained in:
Ingo Oppermann 2023-07-19 16:25:27 +02:00
parent 2f85f78c38
commit a03b38c4a6
No known key found for this signature in database
GPG Key ID: 2AB32426E9DD229E
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
session/collector.go
View File

@ -313,8 +313,8 @@ func newCollector(id string, sessionsCh chan<- Session, logger log.Logger, confi
},
}
c.sessions = make(map[string]*session)
c.history.Sessions = make(map[string]totals)
c.sessions = map[string]*session{}
c.history.Sessions = map[string]totals{}
c.staleCallback = func(sess *session) {
defer func() {
@ -495,6 +495,10 @@ func (c *collector) Restore(snapshot io.ReadCloser) error {
c.lock.history.Lock()
defer c.lock.history.Unlock()
if data.Sessions == nil {
data.Sessions = map[string]totals{}
}
c.history = data
return nil

41
session/collector_test.go
View File

@ -4,18 +4,19 @@ import (
"testing"
"time"
"github.com/datarhei/core/v16/io/fs"
"github.com/stretchr/testify/require"
)
func createCollector(inactive, session time.Duration) (*collector, error) {
return newCollector("", nil, nil, CollectorConfig{
func createCollector(inactive, session time.Duration, sessionsCh chan<- Session) (*collector, error) {
return newCollector("", sessionsCh, nil, CollectorConfig{
InactiveTimeout: inactive,
SessionTimeout: session,
})
}
func TestRegisterSession(t *testing.T) {
c, err := createCollector(time.Hour, time.Hour)
c, err := createCollector(time.Hour, time.Hour, nil)
require.Equal(t, nil, err)
b := c.IsKnownSession("foobar")
@ -35,7 +36,7 @@ func TestRegisterSession(t *testing.T) {
}
func TestInactiveSession(t *testing.T) {
c, err := createCollector(time.Second, time.Hour)
c, err := createCollector(time.Second, time.Hour, nil)
require.Equal(t, nil, err)
b := c.IsKnownSession("foobar")
@ -53,7 +54,7 @@ func TestInactiveSession(t *testing.T) {
}
func TestActivateSession(t *testing.T) {
c, err := createCollector(time.Second, time.Second)
c, err := createCollector(time.Second, time.Second, nil)
require.Equal(t, nil, err)
b := c.IsKnownSession("foobar")
@ -71,7 +72,7 @@ func TestActivateSession(t *testing.T) {
}
func TestIngress(t *testing.T) {
c, err := createCollector(time.Second, time.Hour)
c, err := createCollector(time.Second, time.Hour, nil)
require.Equal(t, nil, err)
c.RegisterAndActivate("foobar", "", "", "")
@ -87,7 +88,7 @@ func TestIngress(t *testing.T) {
}
func TestEgress(t *testing.T) {
c, err := createCollector(time.Second, time.Hour)
c, err := createCollector(time.Second, time.Hour, nil)
require.Equal(t, nil, err)
c.RegisterAndActivate("foobar", "", "", "")
@ -103,7 +104,7 @@ func TestEgress(t *testing.T) {
}
func TestNbSessions(t *testing.T) {
c, err := createCollector(time.Hour, time.Hour)
c, err := createCollector(time.Hour, time.Hour, nil)
require.Equal(t, nil, err)
nsessions := c.Sessions()
@ -131,3 +132,27 @@ func TestNbSessions(t *testing.T) {
nsessions = c.Sessions()
require.Equal(t, uint64(0), nsessions)
}
func TestHistoryRestore(t *testing.T) {
sessions := make(chan Session, 1)
c, err := createCollector(time.Hour, time.Hour, sessions)
require.Equal(t, nil, err)
memfs, err := fs.NewMemFilesystem(fs.MemConfig{})
require.NoError(t, err)
_, _, err = memfs.WriteFile("/foobar.json", []byte("{}"))
require.NoError(t, err)
snapshot, err := NewHistorySource(memfs, "/foobar.json")
require.NoError(t, err)
err = c.Restore(snapshot)
require.NoError(t, err)
c.RegisterAndActivate("foo", "", "", "")
c.Close("foo")
<-sessions
}