claudecodeandClaude
e2b0732014
Concurrency & correctness: - #10: guard IpDb Query/IsLoaded with RLock so Reload() (which reassigns d.r and closes the old reader) cannot race with concurrent lookups. Confirmed via -race regression test. - #12: replace DbUpdatedAt time.Time with atomic.Int64 (cron writes, /metrics reads) to fix the read/write data race. - #11: graceful HTTP shutdown (srv.Shutdown with 10s timeout) instead of srv.Close() aborting in-flight requests. - #14: stop swallowing mergeMmdb() errors in fetchDbs() — keep the previous DB when a merge fails instead of reloading a possibly-empty output. - #13: add resty timeout (2m) + retry (x2) to download() so a hung CDN can't stall the daily cron forever. - #15: correct HTTP status codes (503 db loading, 404 not found via new ErrNotFound sentinel, 500 otherwise) instead of 200 on query error. Robustness: - #16: surface osx.Copy dstFile.Close() errors (flush may fail) via named return + defer. Dependency migration: - #17: migrate maxminddb-golang v1 -> v2. v2 is a breaking API (LookupNetwork -> Lookup returning Result, netip.Addr), so Query was rewritten; v1 dropped from go.mod. Tests: - #21: add internal/data unit tests (valid/invalid/not-found lookup) plus a concurrent Query/Reload race regression test. chdir to repo root in TestMain because data helpers use relative paths. Cleanup: - #18: README Go version 1.22 -> 1.25. - #19: replace stray fmt.Printf with zerolog in ipdb.go. - #20: .env.example API_PORT 28080 -> 8080 (container port, matches docker-compose 28080:8080 mapping) with an explanatory comment. Closes #10, #11, #12, #13, #14, #15, #16, #17, #18, #19, #20, #21 Co-Authored-By: Claude <noreply@anthropic.com>
54 lines
1.3 KiB
Go
54 lines
1.3 KiB
Go
package db_updater
|
|
|
|
import (
|
|
"github.com/robfig/cron/v3"
|
|
"github.com/rs/zerolog/log"
|
|
"sync/atomic"
|
|
"thuanle.me/ip-info/configs"
|
|
"thuanle.me/ip-info/internal/data"
|
|
"time"
|
|
)
|
|
|
|
// DbUpdatedAt stores the DB last-updated time as unix milliseconds.
|
|
// Accessed concurrently by the cron goroutine (writer) and the /metrics
|
|
// handler (reader), so it must be synchronized — hence atomic.Int64.
|
|
var DbUpdatedAt atomic.Int64
|
|
|
|
// DbUpdatedAtMillis returns the last DB update time in unix milliseconds,
|
|
// or 0 if the DB has never been updated.
|
|
func DbUpdatedAtMillis() int64 {
|
|
return DbUpdatedAt.Load()
|
|
}
|
|
|
|
func StartUpdateDbService() {
|
|
c := cron.New()
|
|
_, _ = c.AddFunc("@daily", fetchDbs)
|
|
c.Start()
|
|
fetchDbs()
|
|
}
|
|
|
|
func fetchDbs() {
|
|
newFlag := false
|
|
for _, url := range configs.GeoDbSourcePaths {
|
|
newFlag = download(url) || newFlag
|
|
}
|
|
|
|
if newFlag {
|
|
log.Info().Msg("New DB downloaded. Recreating mmdb")
|
|
if err := mergeMmdb(); err != nil {
|
|
// Keep the current (previous) DB rather than reloading a
|
|
// potentially empty/corrupt merge output.
|
|
log.Err(err).Msg("Failed to merge mmdb, keeping current DB")
|
|
return
|
|
}
|
|
|
|
err := data.Ins().Reload()
|
|
if err != nil {
|
|
log.Err(err).Msg("Failed to reload mmdb")
|
|
return
|
|
}
|
|
|
|
DbUpdatedAt.Store(time.Now().UnixMilli())
|
|
}
|
|
}
|