mirror of
https://github.com/yusing/godoxy.git
synced 2026-02-19 00:47:41 +01:00
6da7227f9b
This is a large-scale refactoring across the codebase that replaces the custom `gperr.Error` type with Go's standard `error` interface. The changes include: - Replacing `gperr.Error` return types with `error` in function signatures - Using `errors.New()` and `fmt.Errorf()` instead of `gperr.New()` and `gperr.Errorf()` - Using `%w` format verb for error wrapping instead of `.With()` method - Replacing `gperr.Subject()` calls with `gperr.PrependSubject()` - Converting error logging from `gperr.Log*()` functions to zerolog's `.Err().Msg()` pattern - Update NewLogger to handle multiline error message - Updating `goutils` submodule to latest commit This refactoring aligns with Go idioms and removes the dependency on custom error handling abstractions in favor of standard library patterns.
46 lines
935 B
Go
46 lines
935 B
Go
package maxmind
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"github.com/rs/zerolog"
|
|
"github.com/rs/zerolog/log"
|
|
"github.com/yusing/godoxy/internal/notif"
|
|
"github.com/yusing/goutils/task"
|
|
)
|
|
|
|
var instance *MaxMind
|
|
|
|
var warnOnce sync.Once
|
|
|
|
func warnNotConfigured() {
|
|
log.Warn().Msg("MaxMind not configured, geo lookup will fail")
|
|
notif.Notify(¬if.LogMessage{
|
|
Level: zerolog.WarnLevel,
|
|
Title: "MaxMind not configured",
|
|
Body: notif.MessageBody("MaxMind is not configured, geo lookup will fail"),
|
|
Color: notif.ColorError,
|
|
})
|
|
}
|
|
|
|
func SetInstance(parent task.Parent, cfg *Config) error {
|
|
newInstance := &MaxMind{Config: cfg}
|
|
if err := newInstance.LoadMaxMindDB(parent); err != nil {
|
|
return err
|
|
}
|
|
instance = newInstance
|
|
return nil
|
|
}
|
|
|
|
func HasInstance() bool {
|
|
return instance != nil
|
|
}
|
|
|
|
func LookupCity(ip *IPInfo) (*City, bool) {
|
|
if instance == nil {
|
|
warnOnce.Do(warnNotConfigured)
|
|
return nil, false
|
|
}
|
|
return instance.lookupCity(ip)
|
|
}
|