Compare commits

...

19 Commits

Author SHA1 Message Date
Carlosokumu
e2d1f65bb3 implement connect 2025-04-08 12:43:35 +03:00
Carlosokumu
bdde401439 use gdbm db implementation 2025-04-08 12:28:24 +03:00
Carlosokumu
a5c1ac2415 upgrade go-vise dep 2025-04-08 11:28:44 +03:00
Carlosokumu
504e4baf56 add function to create a log db 2025-04-08 11:27:55 +03:00
Carlosokumu
d8a852575d implement dummy base 2025-04-08 10:33:49 +03:00
lash
c8c0daac24 Merge remote-tracking branch 'origin/master' into feature/6-config-reporter-new 2025-03-15 02:25:42 +00:00
lash
1bcffe2d23 Make tests work without configreport flag 2025-03-15 02:22:48 +00:00
bf10e5357c Merge pull request 'config reporter' (#7) from konstantinmds/visedriver:feature/6-config-reporter-new into master
Reviewed-on: #7
2025-02-28 00:09:49 +01:00
Konstantin
d91c96f541 removing redundant logline 2025-02-28 00:06:14 +01:00
Konstantin
ec9032a42e change on report method 2025-02-25 00:17:00 +01:00
Konstantin
6619afe62b config reporter for external applications 2025-02-07 16:04:40 +01:00
lash
1eb0b15552 Update deps 2025-02-04 13:23:47 +00:00
lash
ef803e0ee2 Enable custom engine factory 2025-02-04 13:08:08 +00:00
lash
03d19283f6 Apply dbconn explicit to all conns by default 2025-01-24 10:09:46 +00:00
lash
15ce29a1a4 Fmt 2025-01-22 18:37:54 +00:00
lash
6749c632b0 Correct handling of db modes 2025-01-22 12:34:24 +00:00
lash
8530c45074 Enable db text/binary mode set in override, config 2025-01-22 09:37:11 +00:00
lash
d5e636fbd6 Gofmt 2025-01-21 15:30:53 +00:00
lash
f7d31e4e81 Update deps 2025-01-21 13:49:12 +00:00
20 changed files with 414 additions and 124 deletions

View File

@@ -1,6 +1,7 @@
package config package config
import ( import (
"strconv"
"strings" "strings"
"git.defalsify.org/vise.git/logging" "git.defalsify.org/vise.git/logging"
@@ -15,17 +16,33 @@ var (
DefaultLanguage string DefaultLanguage string
dbConn string dbConn string
dbConnMissing bool dbConnMissing bool
dbConnMode storage.DbMode
stateDbConn string stateDbConn string
stateDbConnMode storage.DbMode
resourceDbConn string resourceDbConn string
resourceDbConnMode storage.DbMode
userDbConn string userDbConn string
userDbConnMode storage.DbMode
Languages []string Languages []string
configManager *Config
) )
type Override struct {
DbConn string
DbConnMode storage.DbMode
StateConn string
StateConnMode storage.DbMode
ResourceConn string
ResourceConnMode storage.DbMode
UserConn string
UserConnMode storage.DbMode
}
func setLanguage() error { func setLanguage() error {
defaultLanguage = env.GetEnv("DEFAULT_LANGUAGE", defaultLanguage) defaultLanguage = env.GetEnv("DEFAULT_LANGUAGE", defaultLanguage)
languages = strings.Split(env.GetEnv("LANGUAGES", defaultLanguage), ",") languages = strings.Split(env.GetEnv("LANGUAGES", defaultLanguage), ",")
haveDefaultLanguage := false haveDefaultLanguage := false
for i, v := range(languages) { for i, v := range languages {
languages[i] = strings.ReplaceAll(v, " ", "") languages[i] = strings.ReplaceAll(v, " ", "")
if languages[i] == defaultLanguage { if languages[i] == defaultLanguage {
haveDefaultLanguage = true haveDefaultLanguage = true
@@ -47,18 +64,22 @@ func setConn() error {
return nil return nil
} }
func ApplyConn(connStr *string, stateConnStr *string, resourceConnStr *string, userConnStr *string) { func ApplyConn(override *Override) {
if connStr != nil { if override.DbConn != "?" {
dbConn = *connStr dbConn = override.DbConn
stateDbConn = override.StateConn
resourceDbConn = override.ResourceConn
userDbConn = override.UserConn
} }
if stateConnStr != nil { dbConnMode = override.DbConnMode
stateDbConn = *stateConnStr if override.StateConn != "?" {
stateDbConn = override.StateConn
} }
if resourceConnStr != nil { if override.ResourceConn != "?" {
resourceDbConn = *resourceConnStr resourceDbConn = override.ResourceConn
} }
if userConnStr != nil { if override.UserConn != "?" {
userDbConn = *userConnStr userDbConn = override.UserConn
} }
if dbConn == "?" { if dbConn == "?" {
@@ -67,28 +88,45 @@ func ApplyConn(connStr *string, stateConnStr *string, resourceConnStr *string, u
if stateDbConn == "?" { if stateDbConn == "?" {
stateDbConn = dbConn stateDbConn = dbConn
stateDbConnMode = dbConnMode
} }
if resourceDbConn == "?" { if resourceDbConn == "?" {
resourceDbConn = dbConn resourceDbConn = dbConn
resourceDbConnMode = dbConnMode
} }
if userDbConn == "?" { if userDbConn == "?" {
userDbConn = dbConn userDbConn = dbConn
userDbConnMode = dbConnMode
}
logg.Debugf("conns", "conn", dbConn, "user", userDbConn)
if override.DbConnMode != storage.DBMODE_ANY {
dbConnMode = override.DbConnMode
}
if override.StateConnMode != storage.DBMODE_ANY {
stateDbConnMode = override.StateConnMode
}
if override.ResourceConnMode != storage.DBMODE_ANY {
resourceDbConnMode = override.ResourceConnMode
}
if override.UserConnMode != storage.DBMODE_ANY {
userDbConnMode = override.UserConnMode
} }
} }
func GetConns() (storage.Conns, error) { func GetConns() (storage.Conns, error) {
o := storage.NewConns() o := storage.NewConns()
c, err := storage.ToConnData(stateDbConn) c, err := storage.ToConnDataMode(stateDbConn, stateDbConnMode)
if err != nil { if err != nil {
return o, err return o, err
} }
o.Set(c, storage.STORETYPE_STATE) o.Set(c, storage.STORETYPE_STATE)
c, err = storage.ToConnData(resourceDbConn) c, err = storage.ToConnDataMode(resourceDbConn, resourceDbConnMode)
if err != nil { if err != nil {
return o, err return o, err
} }
o.Set(c, storage.STORETYPE_RESOURCE) o.Set(c, storage.STORETYPE_RESOURCE)
c, err = storage.ToConnData(userDbConn) c, err = storage.ToConnDataMode(userDbConn, userDbConnMode)
if err != nil { if err != nil {
return o, err return o, err
} }
@@ -98,6 +136,17 @@ func GetConns() (storage.Conns, error) {
// LoadConfig initializes the configuration values after environment variables are loaded. // LoadConfig initializes the configuration values after environment variables are loaded.
func LoadConfig() error { func LoadConfig() error {
configManager = NewConfig(logg)
// Add configuration keys with validation
configManager.AddKey("HOST", "127.0.0.1", false, nil)
configManager.AddKey("PORT", "7123", false, func(v string) error {
_, err := strconv.Atoi(v)
return err
})
configManager.AddKey("DB_CONN", "", true, nil)
// ... add other keys ? or is enough :/ ...
err := setConn() err := setConn()
if err != nil { if err != nil {
return err return err
@@ -109,5 +158,7 @@ func LoadConfig() error {
DefaultLanguage = defaultLanguage DefaultLanguage = defaultLanguage
Languages = languages Languages = languages
// Report configuration
configManager.Report("INFO")
return nil return nil
} }

63
config/config_test.go Normal file
View File

@@ -0,0 +1,63 @@
// +build configreport
package config
import (
"fmt"
"os"
"testing"
"git.defalsify.org/vise.git/logging"
)
// go test -tags configreport ./config/... ---> run with tag
func TestConfig(t *testing.T) {
logger := logging.NewVanilla().WithDomain("test")
cfg := NewConfig(logger)
t.Run("Default Values", func(t *testing.T) {
cfg.AddKey("TEST_KEY", "default", false, nil)
value, err := cfg.GetValue("TEST_KEY")
t.Logf("Got value: %q, error: %v", value, err)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
if value != "default" {
t.Errorf("expected 'default', got '%s'", value)
}
})
t.Run("Environment Override", func(t *testing.T) {
os.Setenv("TEST_ENV_KEY", "override")
defer os.Unsetenv("TEST_ENV_KEY")
cfg.AddKey("TEST_ENV_KEY", "default", false, nil)
value, err := cfg.GetValue("TEST_ENV_KEY")
t.Logf("Got value: %q, error: %v", value, err)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
if value != "override" {
t.Errorf("expected 'override', got '%s'", value)
}
})
t.Run("Validation", func(t *testing.T) {
validator := func(v string) error {
if v != "valid" {
return fmt.Errorf("invalid value")
}
return nil
}
cfg.AddKey("VALIDATED_KEY", "valid", false, validator)
os.Setenv("VALIDATED_KEY", "invalid")
defer os.Unsetenv("VALIDATED_KEY")
value, err := cfg.GetValue("VALIDATED_KEY")
t.Logf("Got value: %q, error: %v", value, err)
if err == nil {
t.Error("expected validation error, got nil")
}
})
}

95
config/reporter.go Normal file
View File

@@ -0,0 +1,95 @@
//go:build configreport
package config
import (
"fmt"
"git.defalsify.org/vise.git/logging"
"git.grassecon.net/grassrootseconomics/visedriver/env"
)
// ConfigValue represents a configuration key-value pair
type ConfigValue struct {
Key string
Default string
Validator func(string) error
Sensitive bool
}
// Config handles configuration management and reporting
type Config struct {
values map[string]ConfigValue
logger logging.Vanilla
}
func NewConfig(logger logging.Vanilla) *Config {
return &Config{
values: make(map[string]ConfigValue),
logger: logger,
}
}
// AddKey registers a new configuration key with optional validation
func (c *Config) AddKey(key string, defaultValue string, sensitive bool, validator func(string) error) {
c.values[key] = ConfigValue{
Key: key,
Default: defaultValue,
Validator: validator,
Sensitive: sensitive,
}
}
// GetValue returns the value for a given key, applying environment override if present
func (c *Config) GetValue(key string) (string, error) {
// Find config value by key
var cv ConfigValue
for _, v := range c.values {
if v.Key == key {
cv = v
break
}
}
if cv.Key == "" {
return "", fmt.Errorf("configuration key not found: %s", key)
}
// Get value from environment or default
value := env.GetEnv(key, cv.Default)
// Validate if validator exists
if cv.Validator != nil && cv.Validator(value) != nil {
return "", fmt.Errorf("invalid value for key %s", key)
}
return value, nil
}
// Report outputs all configuration values at the specified log level
func (c *Config) Report(level string) {
for _, cv := range c.values {
value, err := c.GetValue(cv.Key)
if err != nil {
c.logger.Errorf("Error getting value for %s: %v", cv.Key, err)
continue
}
if cv.Sensitive {
value = "****"
}
switch level {
case "DEBUG":
c.logger.Debugf("config set", cv.Key, value)
case "INFO":
c.logger.Infof("config set", cv.Key, value)
case "WARN":
c.logger.Warnf("config set", cv.Key, value)
case "ERROR":
c.logger.Errorf("config set", cv.Key, value)
default:
c.logger.Infof("config set", cv.Key, value)
}
}
}

21
config/reporter_noop.go Normal file
View File

@@ -0,0 +1,21 @@
//go:build !configreport
package config
import (
"git.defalsify.org/vise.git/logging"
)
type Config struct{}
func NewConfig(logger logging.Vanilla) *Config {
return &Config{}
}
func (c *Config) AddKey(key string, defaultValue string, sensitive bool, validator func(string) error) {}
func (c *Config) GetValue(key string) (string, error) {
return "", nil
}
func (c *Config) Report(level string) {}

View File

@@ -2,8 +2,9 @@ package entry
import ( import (
"context" "context"
"git.defalsify.org/vise.git/resource"
"git.defalsify.org/vise.git/persist" "git.defalsify.org/vise.git/persist"
"git.defalsify.org/vise.git/resource"
) )
type EntryHandler interface { type EntryHandler interface {

2
go.mod
View File

@@ -3,7 +3,7 @@ module git.grassecon.net/grassrootseconomics/visedriver
go 1.23.0 go 1.23.0
require ( require (
git.defalsify.org/vise.git v0.2.3-0.20250119111745-4f69d6fe5939 git.defalsify.org/vise.git v0.3.2-0.20250407143413-e55cf9bcb7d2
github.com/jackc/pgx/v5 v5.7.1 github.com/jackc/pgx/v5 v5.7.1
github.com/joho/godotenv v1.5.1 github.com/joho/godotenv v1.5.1
) )

6
go.sum
View File

@@ -1,5 +1,7 @@
git.defalsify.org/vise.git v0.2.3-0.20250119111745-4f69d6fe5939 h1:DA0gus9TuKpLvZMDmmqCAwAr5Lly+U93jtO2OKtGAeo= git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e h1:gtB9OdX6x5gQRM3W824dEurXuuf/YPInqgtv2KAp5Zo=
git.defalsify.org/vise.git v0.2.3-0.20250119111745-4f69d6fe5939/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck= git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
git.defalsify.org/vise.git v0.3.2-0.20250407143413-e55cf9bcb7d2 h1:kbiDZtvphEKsTAnebrB6QxRbB7zdoTHSmzzumXrJ4hw=
git.defalsify.org/vise.git v0.3.2-0.20250407143413-e55cf9bcb7d2/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE= github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE=
github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U= github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

View File

@@ -7,28 +7,37 @@ import (
"git.defalsify.org/vise.git/engine" "git.defalsify.org/vise.git/engine"
"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.grassecon.net/grassrootseconomics/visedriver/storage"
"git.grassecon.net/grassrootseconomics/visedriver/errors"
"git.grassecon.net/grassrootseconomics/visedriver/entry" "git.grassecon.net/grassrootseconomics/visedriver/entry"
"git.grassecon.net/grassrootseconomics/visedriver/errors"
"git.grassecon.net/grassrootseconomics/visedriver/storage"
) )
type EngineFunc func(engine.Config, resource.Resource, *persist.Persister) engine.Engine
type BaseRequestHandler struct { type BaseRequestHandler struct {
cfgTemplate engine.Config cfgTemplate engine.Config
rp RequestParser rp RequestParser
rs resource.Resource rs resource.Resource
hn entry.EntryHandler hn entry.EntryHandler
provider storage.StorageProvider provider storage.StorageProvider
engineFunc EngineFunc
} }
//func NewBaseRequestHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp request.RequestParser, hn *handlers.Handlers) *BaseRequestHandler {
func NewBaseRequestHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp RequestParser, hn entry.EntryHandler) *BaseRequestHandler { func NewBaseRequestHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp RequestParser, hn entry.EntryHandler) *BaseRequestHandler {
return &BaseRequestHandler{ h := &BaseRequestHandler{
cfgTemplate: cfg, cfgTemplate: cfg,
rs: rs, rs: rs,
hn: hn, hn: hn,
rp: rp, rp: rp,
provider: storage.NewSimpleStorageProvider(stateDb, userdataDb), provider: storage.NewSimpleStorageProvider(stateDb, userdataDb),
} }
h.engineFunc = h.getDefaultEngine
return h
}
func (f *BaseRequestHandler) WithEngineFunc(fn EngineFunc) *BaseRequestHandler {
f.engineFunc = fn
return f
} }
func (f *BaseRequestHandler) Shutdown(ctx context.Context) { func (f *BaseRequestHandler) Shutdown(ctx context.Context) {
@@ -39,15 +48,22 @@ func (f *BaseRequestHandler) Shutdown(ctx context.Context) {
} }
func (f *BaseRequestHandler) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine { func (f *BaseRequestHandler) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine {
return f.engineFunc(cfg, rs, pr)
}
func (f *BaseRequestHandler) getDefaultEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine {
en := engine.NewEngine(cfg, rs) en := engine.NewEngine(cfg, rs)
en = en.WithPersister(pr) en = en.WithPersister(pr)
en = en.WithFirst(f.hn.Init)
if f.cfgTemplate.EngineDebug {
en = en.WithDebug(nil)
}
return en return en
} }
func (f *BaseRequestHandler) Process(rqs RequestSession) (RequestSession, error) { func (f *BaseRequestHandler) Process(rqs RequestSession) (RequestSession, error) {
var r bool var r bool
var err error var err error
var ok bool
logg.InfoCtxf(rqs.Ctx, "new request", "data", rqs) logg.InfoCtxf(rqs.Ctx, "new request", "data", rqs)
@@ -57,27 +73,12 @@ func(f *BaseRequestHandler) Process(rqs RequestSession) (RequestSession, error)
return rqs, errors.ErrStorage return rqs, errors.ErrStorage
} }
//f.hn = f.hn.WithPersister(rqs.Storage.Persister)
f.hn.SetPersister(rqs.Storage.Persister) f.hn.SetPersister(rqs.Storage.Persister)
defer func() { defer func() {
f.hn.Exit() f.hn.Exit()
}() }()
eni := f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
en, ok := eni.(*engine.DefaultEngine)
if !ok {
perr := f.provider.Put(rqs.Ctx, rqs.Config.SessionId, rqs.Storage)
rqs.Storage = nil
if perr != nil {
logg.ErrorCtxf(rqs.Ctx, "", "storage put error", perr)
}
return rqs, errors.ErrEngineType
}
en = en.WithFirst(f.hn.Init)
if rqs.Config.EngineDebug {
en = en.WithDebug(nil)
}
rqs.Engine = en
rqs.Engine = f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
r, err = rqs.Engine.Exec(rqs.Ctx, rqs.Input) r, err = rqs.Engine.Exec(rqs.Ctx, rqs.Input)
if err != nil { if err != nil {
perr := f.provider.Put(rqs.Ctx, rqs.Config.SessionId, rqs.Storage) perr := f.provider.Put(rqs.Ctx, rqs.Config.SessionId, rqs.Storage)

View File

@@ -5,8 +5,8 @@ import (
"strconv" "strconv"
"git.defalsify.org/vise.git/logging" "git.defalsify.org/vise.git/logging"
"git.grassecon.net/grassrootseconomics/visedriver/request"
"git.grassecon.net/grassrootseconomics/visedriver/errors" "git.grassecon.net/grassrootseconomics/visedriver/errors"
"git.grassecon.net/grassrootseconomics/visedriver/request"
) )
var ( var (

View File

@@ -10,8 +10,8 @@ import (
"git.defalsify.org/vise.git/engine" "git.defalsify.org/vise.git/engine"
viseerrors "git.grassecon.net/grassrootseconomics/visedriver/errors" viseerrors "git.grassecon.net/grassrootseconomics/visedriver/errors"
"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks/httpmocks"
"git.grassecon.net/grassrootseconomics/visedriver/request" "git.grassecon.net/grassrootseconomics/visedriver/request"
"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks/httpmocks"
) )
// invalidRequestType is a custom type to test invalid request scenarios // invalidRequestType is a custom type to test invalid request scenarios

View File

@@ -4,10 +4,10 @@ import (
"context" "context"
"io" "io"
"git.defalsify.org/vise.git/resource"
"git.defalsify.org/vise.git/persist"
"git.defalsify.org/vise.git/engine" "git.defalsify.org/vise.git/engine"
"git.defalsify.org/vise.git/logging" "git.defalsify.org/vise.git/logging"
"git.defalsify.org/vise.git/persist"
"git.defalsify.org/vise.git/resource"
"git.grassecon.net/grassrootseconomics/visedriver/storage" "git.grassecon.net/grassrootseconomics/visedriver/storage"
) )

View File

@@ -5,6 +5,8 @@ import (
"net/url" "net/url"
) )
type DbMode uint8
const ( const (
DBTYPE_NONE = iota DBTYPE_NONE = iota
DBTYPE_MEM DBTYPE_MEM
@@ -13,6 +15,12 @@ const (
DBTYPE_POSTGRES DBTYPE_POSTGRES
) )
const (
DBMODE_ANY DbMode = iota
DBMODE_BINARY
DBMODE_TEXT
)
const ( const (
STORETYPE_STATE = iota STORETYPE_STATE = iota
STORETYPE_RESOURCE STORETYPE_RESOURCE
@@ -20,6 +28,12 @@ const (
_STORETYPE_MAX _STORETYPE_MAX
) )
var (
DbModeDebug = []string{"ANY", "BIN", "TXT"}
DbTypeDebug = []string{"NONE", "MEM", "FS", "GDBM", "POSTGRES"}
DbStoreDebug = []string{"STATE", "RESOURCE", "USER"}
)
type Conns map[int8]ConnData type Conns map[int8]ConnData
func NewConns() Conns { func NewConns() Conns {
@@ -35,16 +49,18 @@ func (c Conns) Set(conn ConnData, typ int8) {
} }
func (c Conns) Have(conn *ConnData) int8 { func (c Conns) Have(conn *ConnData) int8 {
for i := range(_STORETYPE_MAX) { for i := range _STORETYPE_MAX {
ii := int8(i) ii := int8(i)
v, ok := c[ii] v, ok := c[ii]
if !ok { if !ok {
continue continue
} }
if v.String() == conn.String() { if v.Raw() == conn.Raw() {
if v.Mode() == DBMODE_ANY || v.Mode() == conn.Mode() {
return ii return ii
} }
} }
}
return -1 return -1
} }
@@ -52,22 +68,31 @@ type ConnData struct {
typ int typ int
str string str string
domain string domain string
mode DbMode
} }
func (cd *ConnData) DbType() int { func (cd *ConnData) DbType() int {
return cd.typ return cd.typ
} }
func (cd *ConnData) String() string { func (cd ConnData) String() string {
return cd.str return fmt.Sprintf("conn: %s, mod %s, typ %s", cd.str, DbModeDebug[uint8(cd.mode)], DbTypeDebug[uint8(cd.typ)])
} }
func (cd *ConnData) Domain() string { func (cd *ConnData) Domain() string {
return cd.domain return cd.domain
} }
func (cd *ConnData) Mode() DbMode {
return cd.mode
}
func (cd *ConnData) Path() string { func (cd *ConnData) Path() string {
v, _ := url.Parse(cd.str) v, _ := url.Parse(cd.str)
v.RawQuery = "" v.RawQuery = ""
return v.String() return v.String()
} }
func (cd *ConnData) Raw() string {
return cd.str
}

View File

@@ -90,6 +90,10 @@ func(tdb *ThreadGdbmDb) Prefix() uint8 {
return v return v
} }
func (tdb *ThreadGdbmDb) Base() *db.DbBase {
return tdb.Base()
}
func (tdb *ThreadGdbmDb) SetLock(typ uint8, locked bool) error { func (tdb *ThreadGdbmDb) SetLock(typ uint8, locked bool) error {
tdb.reserve() tdb.reserve()
err := tdb.db.SetLock(typ, locked) err := tdb.db.SetLock(typ, locked)

View File

@@ -61,6 +61,15 @@ func probeMem(s string) (string, string, bool) {
return "", "", true return "", "", true
} }
func ToConnDataMode(connStr string, mode DbMode) (ConnData, error) {
o, err := ToConnData(connStr)
if err != nil {
return o, err
}
o.mode = mode
return o, nil
}
func ToConnData(connStr string) (ConnData, error) { func ToConnData(connStr string) (ConnData, error) {
var o ConnData var o ConnData

View File

@@ -7,7 +7,6 @@ import (
"os" "os"
"path" "path"
"github.com/jackc/pgx/v5/pgxpool"
"git.defalsify.org/vise.git/db" "git.defalsify.org/vise.git/db"
fsdb "git.defalsify.org/vise.git/db/fs" fsdb "git.defalsify.org/vise.git/db/fs"
memdb "git.defalsify.org/vise.git/db/mem" memdb "git.defalsify.org/vise.git/db/mem"
@@ -17,6 +16,7 @@ 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"
gdbmstorage "git.grassecon.net/grassrootseconomics/visedriver/storage/db/gdbm" gdbmstorage "git.grassecon.net/grassrootseconomics/visedriver/storage/db/gdbm"
"github.com/jackc/pgx/v5/pgxpool"
) )
var ( var (
@@ -61,6 +61,7 @@ func (ms *MenuStorageService) checkDb(ctx context.Context,typ int8) db.Db {
return store return store
} }
connData := ms.conns[typ] connData := ms.conns[typ]
logg.DebugCtxf(ctx, "db check", "conn", connData, "store", DbStoreDebug[typ])
v := ms.conns.Have(&connData) v := ms.conns.Have(&connData)
if v == -1 { if v == -1 {
return nil return nil
@@ -70,7 +71,7 @@ func (ms *MenuStorageService) checkDb(ctx context.Context,typ int8) db.Db {
return nil return nil
} }
ms.store[typ] = ms.store[v] ms.store[typ] = ms.store[v]
logg.DebugCtxf(ctx, "found existing db", "typ", typ, "srctyp", v, "store", ms.store[typ], "srcstore", ms.store[v]) logg.DebugCtxf(ctx, "found existing db", "typ", typ, "srctyp", v, "store", ms.store[typ], "srcstore", ms.store[v], "conn", connData)
return ms.store[typ] return ms.store[typ]
} }
@@ -84,7 +85,7 @@ func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, section string,
} }
connData := ms.conns[typ] connData := ms.conns[typ]
connStr := connData.String() connStr := connData.Raw()
dbTyp := connData.DbType() dbTyp := connData.DbType()
if dbTyp == DBTYPE_POSTGRES { if dbTyp == DBTYPE_POSTGRES {
// TODO: move to vise // TODO: move to vise
@@ -105,12 +106,16 @@ func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, section string,
if err != nil { if err != nil {
return nil, err return nil, err
} }
newDb = fsdb.NewFsDb().WithBinary() fsdbInstance := fsdb.NewFsDb()
if connData.Mode() == DBMODE_BINARY {
fsdbInstance = fsdbInstance.WithBinary()
}
newDb = fsdbInstance
} else if dbTyp == DBTYPE_MEM { } else if dbTyp == DBTYPE_MEM {
logg.WarnCtxf(ctx, "using volatile storage (memdb)") logg.WarnCtxf(ctx, "using volatile storage (memdb)")
newDb = memdb.NewMemDb() newDb = memdb.NewMemDb()
} else { } else {
return nil, fmt.Errorf("unsupported connection string: '%s'\n", connData.String()) return nil, fmt.Errorf("unsupported connection string: '%s'\n", connData.Raw())
} }
logg.InfoCtxf(ctx, "connecting to db", "conn", connData, "typ", typ) logg.InfoCtxf(ctx, "connecting to db", "conn", connData, "typ", typ)
err = newDb.Connect(ctx, connStr) err = newDb.Connect(ctx, connStr)
@@ -135,7 +140,7 @@ func (ms *MenuStorageService) WithGettext(path string, lns []lang.Language) *Men
} }
rs := resource.NewPoResource(lns[0], path) rs := resource.NewPoResource(lns[0], path)
for _, ln := range(lns) { for _, ln := range lns {
rs = rs.WithLanguage(ln) rs = rs.WithLanguage(ln)
} }
@@ -164,7 +169,9 @@ func ensureSchemaExists(ctx context.Context, conn ConnData) error {
func applySession(ctx context.Context, store db.Db) error { func applySession(ctx context.Context, store db.Db) error {
sessionId, ok := ctx.Value("SessionId").(string) sessionId, ok := ctx.Value("SessionId").(string)
if !ok { if !ok {
return fmt.Errorf("missing session to apply to store: %v", store) logg.DebugCtxf(ctx, "missing session to apply", "store", store)
return nil
//return fmt.Errorf("missing session to apply to store: %v", store)
} }
store.SetSession(sessionId) store.SetSession(sessionId)
return nil return nil
@@ -179,7 +186,6 @@ func (ms *MenuStorageService) GetPersister(ctx context.Context) (*persist.Persis
if err != nil { if err != nil {
return nil, err return nil, err
} }
pr := persist.NewPersister(stateStore) pr := persist.NewPersister(stateStore)
logg.TraceCtxf(ctx, "menu storage service", "persist", pr, "store", stateStore) logg.TraceCtxf(ctx, "menu storage service", "persist", pr, "store", stateStore)
return pr, nil return pr, nil
@@ -190,7 +196,6 @@ func (ms *MenuStorageService) GetUserdataDb(ctx context.Context) (db.Db, error)
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = applySession(ctx, userStore) err = applySession(ctx, userStore)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -198,6 +203,20 @@ func (ms *MenuStorageService) GetUserdataDb(ctx context.Context) (db.Db, error)
return userStore, nil return userStore, nil
} }
func (ms *MenuStorageService) GetLogDb(ctx context.Context, mainDb db.Db, connStr string, section string) (db.Db, error) {
err := ms.ensureDbDir(connStr)
if err != nil {
return nil, err
}
connStr = path.Join(connStr, section)
tgdbm := gdbmstorage.NewThreadGdbmDb()
err = tgdbm.Connect(ctx, connStr)
if err != nil {
return nil, err
}
return tgdbm, nil
}
func (ms *MenuStorageService) GetResource(ctx context.Context) (resource.Resource, error) { func (ms *MenuStorageService) GetResource(ctx context.Context) (resource.Resource, error) {
store, err := ms.getOrCreateDb(ctx, "resource.gdbm", STORETYPE_RESOURCE) store, err := ms.getOrCreateDb(ctx, "resource.gdbm", STORETYPE_RESOURCE)
if err != nil { if err != nil {
@@ -228,7 +247,7 @@ func (ms *MenuStorageService) ensureDbDir(path string) error {
func (ms *MenuStorageService) Close(ctx context.Context) error { func (ms *MenuStorageService) Close(ctx context.Context) error {
var errs []error var errs []error
var haveErr bool var haveErr bool
for i := range(_STORETYPE_MAX) { for i := range _STORETYPE_MAX {
err := ms.store[int8(i)].Close(ctx) err := ms.store[int8(i)].Close(ctx)
if err != nil { if err != nil {
haveErr = true haveErr = true
@@ -237,7 +256,7 @@ func (ms *MenuStorageService) Close(ctx context.Context) error {
} }
if haveErr { if haveErr {
errStr := "" errStr := ""
for i, err := range(errs) { for i, err := range errs {
errStr += fmt.Sprintf("(%d: %v)", i, err) errStr += fmt.Sprintf("(%d: %v)", i, err)
} }
return errors.New(errStr) return errors.New(errStr)

View File

@@ -5,8 +5,8 @@ import (
"git.defalsify.org/vise.git/db" "git.defalsify.org/vise.git/db"
memdb "git.defalsify.org/vise.git/db/mem" memdb "git.defalsify.org/vise.git/db/mem"
"git.defalsify.org/vise.git/resource"
"git.defalsify.org/vise.git/persist" "git.defalsify.org/vise.git/persist"
"git.defalsify.org/vise.git/resource"
) )
type MemStorageService struct { type MemStorageService struct {
@@ -39,4 +39,3 @@ func (mss *MemStorageService) GetUserdataDb(ctx context.Context) (db.Db, error)
func (mss *MemStorageService) GetResource(ctx context.Context) (resource.Resource, error) { func (mss *MemStorageService) GetResource(ctx context.Context) (resource.Resource, error) {
return mss.rs, nil return mss.rs, nil
} }