Remove persister chainer for menu handler

This commit is contained in:
lash 2025-01-11 08:08:52 +00:00
parent 840c22ca89
commit fd6e5caf53
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
2 changed files with 10 additions and 5 deletions

View File

@ -1,10 +1,13 @@
package entry package entry
import ( import (
"context"
"git.defalsify.org/vise.git/resource"
"git.defalsify.org/vise.git/persist" "git.defalsify.org/vise.git/persist"
) )
type EntryHandler interface { type EntryHandler interface {
Init(context.Context, string, []byte) (*resource.Result, error) // HandlerFunc Init(context.Context, string, []byte) (resource.Result, error) // HandlerFunc
Exit() Exit()
SetPersister(*persist.Persister)
} }

View File

@ -6,10 +6,10 @@ import (
"git.defalsify.org/vise.git/persist" "git.defalsify.org/vise.git/persist"
"git.defalsify.org/vise.git/resource" "git.defalsify.org/vise.git/resource"
"git.defalsify.org/vise.git/logging" "git.defalsify.org/vise.git/logging"
"git.grassecon.net/grassrootseconomics/visedriver/handlers"
"git.grassecon.net/grassrootseconomics/visedriver/request" "git.grassecon.net/grassrootseconomics/visedriver/request"
"git.grassecon.net/grassrootseconomics/visedriver/storage" "git.grassecon.net/grassrootseconomics/visedriver/storage"
"git.grassecon.net/grassrootseconomics/visedriver/errors" "git.grassecon.net/grassrootseconomics/visedriver/errors"
"git.grassecon.net/grassrootseconomics/visedriver/entry"
) )
var ( var (
@ -20,11 +20,12 @@ type BaseSessionHandler struct {
cfgTemplate engine.Config cfgTemplate engine.Config
rp request.RequestParser rp request.RequestParser
rs resource.Resource rs resource.Resource
hn *handlers.Handlers hn entry.EntryHandler
provider storage.StorageProvider provider storage.StorageProvider
} }
func NewBaseSessionHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp request.RequestParser, hn *handlers.Handlers) *BaseSessionHandler { //func NewBaseSessionHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp request.RequestParser, hn *handlers.Handlers) *BaseSessionHandler {
func NewBaseSessionHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp request.RequestParser, hn entry.EntryHandler) *BaseSessionHandler {
return &BaseSessionHandler{ return &BaseSessionHandler{
cfgTemplate: cfg, cfgTemplate: cfg,
rs: rs, rs: rs,
@ -60,7 +61,8 @@ func(f *BaseSessionHandler) Process(rqs request.RequestSession) (request.Request
return rqs, errors.ErrStorage return rqs, errors.ErrStorage
} }
f.hn = f.hn.WithPersister(rqs.Storage.Persister) //f.hn = f.hn.WithPersister(rqs.Storage.Persister)
f.hn.SetPersister(rqs.Storage.Persister)
defer func() { defer func() {
f.hn.Exit() f.hn.Exit()
}() }()