starred/godoxy-yusing
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-23 00:38:33 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

refactor: remove the use of logging module in most code

Browse Source
This commit is contained in:
yusing
2025-05-23 23:28:33 +08:00
parent 20a1649275
commit 63c4bdc73d
51 changed files with 194 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/jsonstore/jsonstore.go
View File

@@ -9,9 +9,9 @@ import (
"maps"
"github.com/puzpuzpuz/xsync/v4"
"github.com/rs/zerolog/log"
"github.com/yusing/go-proxy/internal/common"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/logging"
"github.com/yusing/go-proxy/internal/serialization"
"github.com/yusing/go-proxy/internal/task"
)
@@ -42,7 +42,7 @@ var storesPath = common.DataDir
func init() {
task.OnProgramExit("save_stores", func() {
if err := save(); err != nil {
logging.Error().Err(err).Msg("failed to save stores")
log.Error().Err(err).Msg("failed to save stores")
}
})
}
@@ -54,20 +54,20 @@ func loadNS[T store](ns namespace) T {
file, err := os.Open(path)
if err != nil {
if !os.IsNotExist(err) {
logging.Err(err).
log.Err(err).
Str("path", path).
Msg("failed to load store")
}
} else {
defer file.Close()
if err := json.NewDecoder(file).Decode(&store); err != nil {
logging.Err(err).
log.Err(err).
Str("path", path).
Msg("failed to load store")
}
}
stores[ns] = store
logging.Debug().
log.Debug().
Str("namespace", string(ns)).
Str("path", path).
Msg("loaded store")
@@ -86,7 +86,7 @@ func save() error {
func Store[VT any](namespace namespace) MapStore[VT] {
if _, ok := stores[namespace]; ok {
logging.Fatal().Str("namespace", string(namespace)).Msg("namespace already exists")
log.Fatal().Str("namespace", string(namespace)).Msg("namespace already exists")
}
store := loadNS[*MapStore[VT]](namespace)
stores[namespace] = store
@@ -95,7 +95,7 @@ func Store[VT any](namespace namespace) MapStore[VT] {
func Object[Ptr Initializer](namespace namespace) Ptr {
if _, ok := stores[namespace]; ok {
logging.Fatal().Str("namespace", string(namespace)).Msg("namespace already exists")
log.Fatal().Str("namespace", string(namespace)).Msg("namespace already exists")
}
obj := loadNS[*ObjectStore[Ptr]](namespace)
stores[namespace] = obj