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>
62 lines
1.3 KiB
Go
62 lines
1.3 KiB
Go
package api
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/rs/zerolog/log"
|
|
"net/http"
|
|
"os"
|
|
"thuanle.me/ip-info/configs"
|
|
"thuanle.me/ip-info/configs/key"
|
|
"time"
|
|
)
|
|
|
|
var srv *http.Server
|
|
|
|
func StartApiService() {
|
|
log.Info().Msg("Starting API service")
|
|
|
|
engine := gin.Default()
|
|
|
|
trustedProxyIP := os.Getenv(key.EnvGinTrustedProxyIp)
|
|
if trustedProxyIP != "" {
|
|
_ = engine.SetTrustedProxies([]string{trustedProxyIP})
|
|
}
|
|
|
|
engine.GET("/", HandleMyIp)
|
|
engine.GET("/json", HandleJson)
|
|
engine.GET("/metrics", HandleMetrics)
|
|
engine.GET("/:ip", HandleOtherIp)
|
|
|
|
port := os.Getenv(key.EnvApiPort)
|
|
if len(port) == 0 {
|
|
port = configs.ApiDefaultPort
|
|
}
|
|
srv = &http.Server{
|
|
Addr: ":" + port,
|
|
Handler: engine,
|
|
}
|
|
|
|
go func() {
|
|
// service connections
|
|
if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
|
log.Fatal().Err(err).Msg("Error running API service")
|
|
}
|
|
}()
|
|
|
|
log.Info().Str("port", port).Msg("API service started")
|
|
|
|
}
|
|
|
|
func Shutdown() {
|
|
// Graceful shutdown: let in-flight requests finish (bounded by a timeout)
|
|
// instead of abruptly closing connections.
|
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
|
defer cancel()
|
|
if err := srv.Shutdown(ctx); err != nil {
|
|
log.Err(err).Msg("Error shutting down API service")
|
|
}
|
|
log.Info().Msg("API service stopped")
|
|
}
|