Temporary solution for make sure storage object gets put back in all cases of execution

internal/handlers/base.go

@@ -50,7 +50,7 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 
 	rqs.Storage, err = f.provider.Get(rqs.Config.SessionId)
 	if err != nil {
-		logg.ErrorCtxf(rqs.Ctx, "", "storage error", "err", err)
+		logg.ErrorCtxf(rqs.Ctx, "", "storage get error", err)
 		return rqs, ErrStorage
 	}
 
@@ -58,6 +58,11 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 	eni := f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
 	en, ok := eni.(*engine.DefaultEngine)
 	if !ok {
+		perr := f.provider.Put(rqs.Config.SessionId, rqs.Storage)
+		rqs.Storage = nil
+		if perr != nil {
+			logg.ErrorCtxf(rqs.Ctx, "", "storage put error", perr)
+		}
 		return rqs, ErrEngineType
 	}
 	en = en.WithFirst(f.hn.Init)
@@ -68,6 +73,11 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 
 	r, err = rqs.Engine.Init(rqs.Ctx)
 	if err != nil {
+		perr := f.provider.Put(rqs.Config.SessionId, rqs.Storage)
+		rqs.Storage = nil
+		if perr != nil {
+			logg.ErrorCtxf(rqs.Ctx, "", "storage put error", perr)
+		}
 		return rqs, err
 	}
 
@@ -75,6 +85,11 @@ func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error)
 		r, err = rqs.Engine.Exec(rqs.Ctx, rqs.Input)
 	}
 	if err != nil {
+		perr := f.provider.Put(rqs.Config.SessionId, rqs.Storage)
+		rqs.Storage = nil
+		if perr != nil {
+			logg.ErrorCtxf(rqs.Ctx, "", "storage put error", perr)
+		}
 		return rqs, err
 	}
 

internal/handlers/single.go

@@ -32,7 +32,7 @@ type RequestSession struct {
 	Config engine.Config
 	Engine engine.Engine
 	Input []byte
-	Storage storage.Storage
+	Storage *storage.Storage
 	Writer io.Writer
 }
 

internal/http/server.go

@@ -68,6 +68,7 @@ func(f *SessionHandler) writeError(w http.ResponseWriter, code int, err error) {
 func(f *SessionHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	var code int
 	var err error
+	var perr error
 
 	rqs := handlers.RequestSession{
 		Ctx: req.Context(),
@@ -109,14 +110,13 @@ func(f *SessionHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	w.WriteHeader(200)
 	w.Header().Set("Content-Type", "text/plain")
 	rqs, err = f.Output(rqs)
+	rqs, perr = f.Reset(rqs)
 	if err != nil {
 		f.writeError(w, 500, err)
 		return
 	}
-
-	rqs, err = f.Reset(rqs)
-	if err != nil {
-		f.writeError(w, 500, err)
+	if perr != nil {
+		f.writeError(w, 500, perr)
 		return
 	}
 }

internal/storage/storage.go

@@ -11,31 +11,31 @@ type Storage struct {
 }
 
 type StorageProvider interface {
-	Get(sessionId string) (Storage, error)
-	Put(sessionId string, storage Storage) error
+	Get(sessionId string) (*Storage, error)
+	Put(sessionId string, storage *Storage) error
 	Close() error
 }
 
 type SimpleStorageProvider struct {
-	Storage
+	*Storage
 }
 
 func NewSimpleStorageProvider(stateStore db.Db, userdataStore db.Db) StorageProvider {
 	pe := persist.NewPersister(stateStore)
 	pe = pe.WithFlush()
 	return &SimpleStorageProvider{
-		Storage: Storage{
+		Storage: &Storage{
 			Persister: pe,
 			UserdataDb: userdataStore,
 		},
 	}
 }
 
-func (p *SimpleStorageProvider) Get(sessionId string) (Storage, error) {
+func (p *SimpleStorageProvider) Get(sessionId string) (*Storage, error) {
 	return p.Storage, nil
 }
 
-func (p *SimpleStorageProvider) Put(sessionId string, storage Storage) error {
+func (p *SimpleStorageProvider) Put(sessionId string, storage *Storage) error {
 	return nil
 }