small changes to the session manager

Author: caffix

engine/api/graphql/server/schema.resolvers.go

@@ -12,6 +12,7 @@ package sessions
  */
 
 import (
+	"errors"
 	"fmt"
 	"log/slog"
 	"os"
@@ -39,31 +40,30 @@ func NewManager(l *slog.Logger) et.SessionManager {
 
 func (r *manager) NewSession(cfg *config.Config) (et.Session, error) {
 	s, err := CreateSession(cfg)
-	if err != nil {
-		return nil, err
-	}
-	if _, err = r.AddSession(s); err != nil {
-		return nil, err
+	if err == nil {
+		err = r.AddSession(s)
+
+		if err == nil {
+			return s, nil
+		}
 	}
-	return s, nil
+	return nil, err
 }
 
 // Add: adds a session to a session storage after checking the session config.
-func (r *manager) AddSession(s et.Session) (uuid.UUID, error) {
+func (r *manager) AddSession(s et.Session) error {
 	if s == nil {
-		return uuid.UUID{}, nil
+		return errors.New("the provided session is nil")
 	}
 
 	r.Lock()
-	defer r.Unlock()
-
-	var id uuid.UUID
 	if sess, ok := s.(*Session); ok {
-		id = sess.id
-		r.sessions[id] = sess
+		r.sessions[sess.id] = sess
 	}
+	r.Unlock()
+
 	// TODO: Need to add the session config checks here (using the Registry)
-	return id, nil
+	return nil
 }
 
 // CancelSession: cancels a session in a session storage.

engine/sessions/manager.go

@@ -24,7 +24,7 @@ func TestAddSession(t *testing.T) {
 		done:  make(chan struct{}),
 	}
 
-	if _, err := mgr.AddSession(s); err != nil {
+	if err := mgr.AddSession(s); err != nil {
 		t.Error(err)
 	}
 }

engine/sessions/manager_test.go

@@ -40,7 +40,7 @@ type SessionStats struct {
 
 type SessionManager interface {
 	NewSession(cfg *config.Config) (Session, error)
-	AddSession(s Session) (uuid.UUID, error)
+	AddSession(s Session) error
 	CancelSession(id uuid.UUID)
 	GetSession(id uuid.UUID) Session
 	Shutdown()