Apply dbconn explicit to all conns by default

config/config.go

@@ -15,17 +15,32 @@ var (
 	DefaultLanguage    string
 	dbConn             string
 	dbConnMissing      bool
+	dbConnMode         storage.DbMode
 	stateDbConn        string
+	stateDbConnMode    storage.DbMode
 	resourceDbConn     string
+	resourceDbConnMode storage.DbMode
 	userDbConn         string
+	userDbConnMode     storage.DbMode
 	Languages          []string
 )
 
+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 {
 	defaultLanguage = env.GetEnv("DEFAULT_LANGUAGE", defaultLanguage)
 	languages = strings.Split(env.GetEnv("LANGUAGES", defaultLanguage), ",")
 	haveDefaultLanguage := false
-	for i, v := range(languages) {
+	for i, v := range languages {
 		languages[i] = strings.ReplaceAll(v, " ", "")
 		if languages[i] == defaultLanguage {
 			haveDefaultLanguage = true
@@ -47,18 +62,22 @@ func setConn() error {
 	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 == "?" {
@@ -67,28 +86,45 @@ func ApplyConn(connStr *string, stateConnStr *string, resourceConnStr *string, u
 
 	if stateDbConn == "?" {
 		stateDbConn = dbConn
+		stateDbConnMode = dbConnMode
 	}
 	if resourceDbConn == "?" {
 		resourceDbConn = dbConn
+		resourceDbConnMode = dbConnMode
 	}
 	if userDbConn == "?" {
 		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) {
 	o := storage.NewConns()
-	c, err := storage.ToConnData(stateDbConn)
+	c, err := storage.ToConnDataMode(stateDbConn, stateDbConnMode)
 	if err != nil {
 		return o, err
 	}
 	o.Set(c, storage.STORETYPE_STATE)
-	c, err = storage.ToConnData(resourceDbConn)
+	c, err = storage.ToConnDataMode(resourceDbConn, resourceDbConnMode)
 	if err != nil {
 		return o, err
 	}
 	o.Set(c, storage.STORETYPE_RESOURCE)
-	c, err = storage.ToConnData(userDbConn)
+	c, err = storage.ToConnDataMode(userDbConn, userDbConnMode)
 	if err != nil {
 		return o, err
 	}

entry/handlers.go

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

request/base.go

@@ -7,9 +7,9 @@ import (
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/persist"
 	"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/errors"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
 type BaseRequestHandler struct {

request/http/server.go

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

request/http/server_test.go

@@ -10,8 +10,8 @@ import (
 
 	"git.defalsify.org/vise.git/engine"
 	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/testutil/mocks/httpmocks"
 )
 
 // invalidRequestType is a custom type to test invalid request scenarios

request/request.go

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

storage/conn.go

@@ -5,6 +5,8 @@ import (
 	"net/url"
 )
 
+type DbMode uint8
+
 const (
 	DBTYPE_NONE = iota
 	DBTYPE_MEM
@@ -13,6 +15,12 @@ const (
 	DBTYPE_POSTGRES
 )
 
+const (
+	DBMODE_ANY DbMode = iota
+	DBMODE_BINARY
+	DBMODE_TEXT
+)
+
 const (
 	STORETYPE_STATE = iota
 	STORETYPE_RESOURCE
@@ -20,6 +28,12 @@ const (
 	_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
 
 func NewConns() Conns {
@@ -35,16 +49,18 @@ func (c Conns) Set(conn ConnData, typ int8) {
 }
 
 func (c Conns) Have(conn *ConnData) int8 {
-	for i := range(_STORETYPE_MAX) {
+	for i := range _STORETYPE_MAX {
 		ii := int8(i)
 		v, ok := c[ii]
 		if !ok {
 			continue
 		}
-		if v.String() == conn.String() {
+		if v.Raw() == conn.Raw() {
+			if v.Mode() == DBMODE_ANY || v.Mode() == conn.Mode() {
 				return ii
 			}
 		}
+	}
 	return -1
 }
 
@@ -52,22 +68,31 @@ type ConnData struct {
 	typ    int
 	str    string
 	domain string
+	mode   DbMode
 }
 
 func (cd *ConnData) DbType() int {
 	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 {
 	return cd.domain
 }
 
+func (cd *ConnData) Mode() DbMode {
+	return cd.mode
+}
+
 func (cd *ConnData) Path() string {
 	v, _ := url.Parse(cd.str)
 	v.RawQuery = ""
 	return v.String()
 }
+
+func (cd *ConnData) Raw() string {
+	return cd.str
+}

storage/parse.go

@@ -61,6 +61,15 @@ func probeMem(s string) (string, string, bool) {
 	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) {
 	var o ConnData
 

storage/storage_service.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"path"
 
-	"github.com/jackc/pgx/v5/pgxpool"
 	"git.defalsify.org/vise.git/db"
 	fsdb "git.defalsify.org/vise.git/db/fs"
 	memdb "git.defalsify.org/vise.git/db/mem"
@@ -17,6 +16,7 @@ import (
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	gdbmstorage "git.grassecon.net/grassrootseconomics/visedriver/storage/db/gdbm"
+	"github.com/jackc/pgx/v5/pgxpool"
 )
 
 var (
@@ -61,6 +61,7 @@ func (ms *MenuStorageService) checkDb(ctx context.Context,typ int8) db.Db {
 		return store
 	}
 	connData := ms.conns[typ]
+	logg.DebugCtxf(ctx, "db check", "conn", connData, "store", DbStoreDebug[typ])
 	v := ms.conns.Have(&connData)
 	if v == -1 {
 		return nil
@@ -70,7 +71,7 @@ func (ms *MenuStorageService) checkDb(ctx context.Context,typ int8) db.Db {
 		return nil
 	}
 	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]
 }
 
@@ -84,7 +85,7 @@ func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, section string,
 	}
 
 	connData := ms.conns[typ]
-	connStr := connData.String()
+	connStr := connData.Raw()
 	dbTyp := connData.DbType()
 	if dbTyp == DBTYPE_POSTGRES {
 		// TODO: move to vise
@@ -105,12 +106,16 @@ func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, section string,
 		if err != nil {
 			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 {
 		logg.WarnCtxf(ctx, "using volatile storage (memdb)")
 		newDb = memdb.NewMemDb()
 	} 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)
 	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)
 
-	for _, ln := range(lns) {
+	for _, ln := range lns {
 		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 {
 	sessionId, ok := ctx.Value("SessionId").(string)
 	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)
 	return nil
@@ -179,7 +186,6 @@ func (ms *MenuStorageService) GetPersister(ctx context.Context) (*persist.Persis
 	if err != nil {
 		return nil, err
 	}
-
 	pr := persist.NewPersister(stateStore)
 	logg.TraceCtxf(ctx, "menu storage service", "persist", pr, "store", stateStore)
 	return pr, nil
@@ -190,7 +196,6 @@ func (ms *MenuStorageService) GetUserdataDb(ctx context.Context) (db.Db, error)
 	if err != nil {
 		return nil, err
 	}
-
 	err = applySession(ctx, userStore)
 	if err != nil {
 		return nil, err
@@ -228,7 +233,7 @@ func (ms *MenuStorageService) ensureDbDir(path string) error {
 func (ms *MenuStorageService) Close(ctx context.Context) error {
 	var errs []error
 	var haveErr bool
-	for i := range(_STORETYPE_MAX) {
+	for i := range _STORETYPE_MAX {
 		err := ms.store[int8(i)].Close(ctx)
 		if err != nil {
 			haveErr = true
@@ -237,7 +242,7 @@ func (ms *MenuStorageService) Close(ctx context.Context) error {
 	}
 	if haveErr {
 		errStr := ""
-		for i, err := range(errs) {
+		for i, err := range errs {
 			errStr += fmt.Sprintf("(%d: %v)", i, err)
 		}
 		return errors.New(errStr)

testutil/mocks/storage.go

@@ -5,8 +5,8 @@ import (
 
 	"git.defalsify.org/vise.git/db"
 	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/resource"
 )
 
 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) {
 	return mss.rs, nil
 }
-