From 770fef68b9528e6f5af6038499dd4de7de67d412 Mon Sep 17 00:00:00 2001 From: Mohammed Sohail Date: Thu, 11 Sep 2025 13:08:35 +0300 Subject: [PATCH] chore (gdbm): remove all gdbm and old logger refs --- config/reporter.go | 21 ++---- go.mod | 2 - go.sum | 4 -- storage/db/gdbm/gdbm.go | 147 ---------------------------------------- 4 files changed, 5 insertions(+), 169 deletions(-) delete mode 100644 storage/db/gdbm/gdbm.go diff --git a/config/reporter.go b/config/reporter.go index c81d2ca..efdaf44 100644 --- a/config/reporter.go +++ b/config/reporter.go @@ -5,8 +5,8 @@ package config import ( "fmt" - "git.defalsify.org/vise.git/logging" "git.grassecon.net/grassrootseconomics/visedriver/env" + slogging "github.com/grassrootseconomics/go-vise/slog" ) // ConfigValue represents a configuration key-value pair @@ -20,13 +20,13 @@ type ConfigValue struct { // Config handles configuration management and reporting type Config struct { values map[string]ConfigValue - logger logging.Vanilla + logger *slogging.Slog } -func NewConfig(logger logging.Vanilla) *Config { +func NewConfig(logging interface{}) *Config { return &Config{ values: make(map[string]ConfigValue), - logger: logger, + logger: slogging.Get().With("component", "visedriver-config-reporter"), } } @@ -79,17 +79,6 @@ func (c *Config) Report(level string) { 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) - } + c.logger.Debugf("config set", cv.Key, value) } } diff --git a/go.mod b/go.mod index e49dde8..59d79a4 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.24 toolchain go1.24.6 require ( - git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e github.com/grassrootseconomics/go-vise v0.5.0 github.com/jackc/pgx/v5 v5.7.5 github.com/joho/godotenv v1.5.1 @@ -15,7 +14,6 @@ require ( github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/fxamacker/cbor/v2 v2.9.0 // indirect - github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect diff --git a/go.sum b/go.sum index a98f6e7..375a78f 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e h1:gtB9OdX6x5gQRM3W824dEurXuuf/YPInqgtv2KAp5Zo= -git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e/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/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -9,8 +7,6 @@ github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sa github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/grassrootseconomics/go-vise v0.5.0 h1:FRg2de55Eb5SisrgTBeFWfWX+sXwp5q9r7YWtKWDwsk= github.com/grassrootseconomics/go-vise v0.5.0/go.mod h1:b2/q4jfTu2i1wyUwYUu7FYq4m2f1AZv8MpiDM3ZcoGo= -github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo= -github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4/go.mod h1:zpZDgZFzeq9s0MIeB1P50NIEWDFFHSFBohI/NbaTD/Y= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= diff --git a/storage/db/gdbm/gdbm.go b/storage/db/gdbm/gdbm.go deleted file mode 100644 index 4d74a11..0000000 --- a/storage/db/gdbm/gdbm.go +++ /dev/null @@ -1,147 +0,0 @@ -package storage - -import ( - "context" - - "git.defalsify.org/vise.git/db" - gdbmdb "git.defalsify.org/vise.git/db/gdbm" - "git.defalsify.org/vise.git/lang" - "git.defalsify.org/vise.git/logging" -) - -var ( - logg = logging.NewVanilla().WithDomain("gdbmstorage") -) - -var ( - dbC map[string]chan db.Db -) - -type ThreadGdbmDb struct { - db db.Db - connStr string -} - -func NewThreadGdbmDb() *ThreadGdbmDb { - if dbC == nil { - dbC = make(map[string]chan db.Db) - } - return &ThreadGdbmDb{} -} - -func (tdb *ThreadGdbmDb) Connect(ctx context.Context, connStr string) error { - var ok bool - _, ok = dbC[connStr] - if ok { - logg.WarnCtxf(ctx, "already registered thread gdbm, skipping", "connStr", connStr) - return nil - } - gdb := gdbmdb.NewGdbmDb() - err := gdb.Connect(ctx, connStr) - if err != nil { - return err - } - dbC[connStr] = make(chan db.Db, 1) - dbC[connStr] <- gdb - tdb.connStr = connStr - return nil -} - -func (tdb *ThreadGdbmDb) reserve() { - if tdb.db == nil { - tdb.db = <-dbC[tdb.connStr] - } -} - -func (tdb *ThreadGdbmDb) release() { - if tdb.db == nil { - return - } - dbC[tdb.connStr] <- tdb.db - tdb.db = nil -} - -func (tdb *ThreadGdbmDb) SetPrefix(pfx uint8) { - tdb.reserve() - tdb.db.SetPrefix(pfx) -} - -func (tdb *ThreadGdbmDb) SetSession(sessionId string) { - tdb.reserve() - tdb.db.SetSession(sessionId) -} - -func (tdb *ThreadGdbmDb) SetLanguage(lng *lang.Language) { - tdb.reserve() - tdb.db.SetLanguage(lng) -} - -func (tdb *ThreadGdbmDb) Safe() bool { - tdb.reserve() - v := tdb.db.Safe() - tdb.release() - return v -} - -func (tdb *ThreadGdbmDb) Prefix() uint8 { - tdb.reserve() - v := tdb.db.Prefix() - tdb.release() - return v -} - -func (tdb *ThreadGdbmDb) SetLock(typ uint8, locked bool) error { - tdb.reserve() - err := tdb.db.SetLock(typ, locked) - tdb.release() - return err -} - -func (tdb *ThreadGdbmDb) Put(ctx context.Context, key []byte, val []byte) error { - tdb.reserve() - err := tdb.db.Put(ctx, key, val) - tdb.release() - return err -} - -func (tdb *ThreadGdbmDb) Get(ctx context.Context, key []byte) ([]byte, error) { - tdb.reserve() - v, err := tdb.db.Get(ctx, key) - tdb.release() - return v, err -} - -func (tdb *ThreadGdbmDb) Close(ctx context.Context) error { - tdb.reserve() - close(dbC[tdb.connStr]) - delete(dbC, tdb.connStr) - err := tdb.db.Close(ctx) - tdb.db = nil - return err -} - -func (tdb *ThreadGdbmDb) Dump(ctx context.Context, key []byte) (*db.Dumper, error) { - tdb.reserve() - defer tdb.release() - return tdb.db.Dump(ctx, key) -} - -func (tdb *ThreadGdbmDb) DecodeKey(ctx context.Context, key []byte) ([]byte, error) { - return tdb.db.DecodeKey(ctx, key) -} - -func (tdb *ThreadGdbmDb) Abort(ctx context.Context) { - tdb.db.Abort(ctx) -} - -func (tdb *ThreadGdbmDb) Start(ctx context.Context) error { - return tdb.db.Start(ctx) -} - -func (tdb *ThreadGdbmDb) Stop(ctx context.Context) error { - return tdb.db.Stop(ctx) -} - -func (tdb *ThreadGdbmDb) Connection() string { - return tdb.db.Connection() -}