root/golib
1
0
Fork 0
mirror of https://github.com/therootcompany/golib.git synced 2026-04-24 12:48:00 +00:00
Code Issues Projects Releases Wiki Activity

revert: inline geoip sync instead of IPCheck.Sync method

Browse Source 
Keep fetch+open+swap inline at both call sites (initial load in main,
background tick in the serve branch). No helper.
This commit is contained in:
AJ ONeal 2026-04-20 16:43:38 -06:00
parent 0c95156d4c
commit 01158aee55
No known key found for this signature in database
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cmd/check-ip/main.go
View File

@ -42,31 +42,9 @@ type IPCheck struct {
// the .tar.gz archives must already exist in <CacheDir>/maxmind/.
GeoIPBasicAuth string
inbound *dataset.View[ipcohort.Cohort]
outbound *dataset.View[ipcohort.Cohort]
geoFetcher dataset.Fetcher
geo atomic.Pointer[geoip.Databases]
}
// Sync fetches the GeoIP archives (via httpcache when basic auth is set,
// otherwise by polling their mtime) and, when the fetcher reports a change,
// re-opens the databases and atomically swaps the active snapshot.
func (c *IPCheck) Sync() (bool, error) {
updated, err := c.geoFetcher.Fetch()
if err != nil {
return false, err
}
if c.geo.Load() != nil && !updated {
return false, nil
}
db, err := geoip.Open(filepath.Join(c.CacheDir, "maxmind"))
if err != nil {
return false, err
}
if old := c.geo.Swap(db); old != nil {
_ = old.Close()
}
return true, nil
inbound *dataset.View[ipcohort.Cohort]
outbound *dataset.View[ipcohort.Cohort]
geo atomic.Pointer[geoip.Databases]
}
func main() {
@ -157,8 +135,10 @@ func main() {
// httpcache conditional GETs. Without them, poll the existing tar.gz
// files in maxmindDir. geoip.Open extracts in-memory — no .mmdb files
// are written to disk.
cityTarPath := filepath.Join(cfg.CacheDir, "maxmind", "GeoLite2-City.tar.gz")
asnTarPath := filepath.Join(cfg.CacheDir, "maxmind", "GeoLite2-ASN.tar.gz")
maxmindDir := filepath.Join(cfg.CacheDir, "maxmind")
cityTarPath := filepath.Join(maxmindDir, "GeoLite2-City.tar.gz")
asnTarPath := filepath.Join(maxmindDir, "GeoLite2-ASN.tar.gz")
var geoFetcher dataset.Fetcher
if cfg.GeoIPBasicAuth != "" {
city := &httpcache.Cacher{
URL: geoip.DownloadBase + "/GeoLite2-City/download?suffix=tar.gz",
@ -174,7 +154,7 @@ func main() {
AuthHeader: "Authorization",
AuthValue: cfg.GeoIPBasicAuth,
}
cfg.geoFetcher = dataset.FetcherFunc(func() (bool, error) {
geoFetcher = dataset.FetcherFunc(func() (bool, error) {
cityUpdated, err := city.Fetch()
if err != nil {
return false, fmt.Errorf("fetch GeoLite2-City: %w", err)
@ -186,11 +166,16 @@ func main() {
return cityUpdated || asnUpdated, nil
})
} else {
cfg.geoFetcher = dataset.PollFiles(cityTarPath, asnTarPath)
geoFetcher = dataset.PollFiles(cityTarPath, asnTarPath)
}
if _, err := cfg.Sync(); err != nil {
if _, err := geoFetcher.Fetch(); err != nil {
log.Fatalf("geoip: %v", err)
}
geoDB, err := geoip.Open(maxmindDir)
if err != nil {
log.Fatalf("geoip: %v", err)
}
cfg.geo.Store(geoDB)
defer func() { _ = cfg.geo.Load().Close() }()
for _, ip := range ips {
@ -213,8 +198,21 @@ func main() {
case <-ctx.Done():
return
case <-t.C:
if _, err := cfg.Sync(); err != nil {
updated, err := geoFetcher.Fetch()
if err != nil {
log.Printf("geoip refresh: %v", err)
continue
}
if !updated {
continue
}
db, err := geoip.Open(maxmindDir)
if err != nil {
log.Printf("geoip refresh: %v", err)
continue
}
if old := cfg.geo.Swap(db); old != nil {
_ = old.Close()
}
}
}