From 5cfbfa608139e2c4f42cce36611b2386abe02104 Mon Sep 17 00:00:00 2001 From: Tyler Date: Thu, 25 Jan 2024 21:33:37 -0500 Subject: [PATCH] [bugfix] Fix compile errors - Fix compile errors not found by prechecks --- config.go | 5 +++-- http.go | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config.go b/config.go index 083e67e..79f8cd2 100644 --- a/config.go +++ b/config.go @@ -3,6 +3,7 @@ package redirector import ( "crypto/tls" "crypto/x509" + "github.com/armbian/redirector/db" lru "github.com/hashicorp/golang-lru" "github.com/oschwald/maxminddb-golang" "github.com/pkg/errors" @@ -168,7 +169,7 @@ func (r *Redirector) ReloadConfig() error { } // Force check - go r.servers.Check(r.checks) + go r.servers.Check(r, r.checks) return nil } @@ -305,7 +306,7 @@ func (r *Redirector) addServer(server ServerConfig, u *url.URL) (*Server, error) return nil, err } - var city City + var city db.City err = r.db.Lookup(ips[0], &city) if err != nil { diff --git a/http.go b/http.go index def8ec7..07a5413 100644 --- a/http.go +++ b/http.go @@ -3,6 +3,7 @@ package redirector import ( "encoding/json" "fmt" + "github.com/armbian/redirector/db" "github.com/jmcvetta/randutil" log "github.com/sirupsen/logrus" "net" @@ -190,7 +191,7 @@ func (r *Redirector) geoIPHandler(w http.ResponseWriter, req *http.Request) { ip := net.ParseIP(ipStr) - var city City + var city db.City err = r.db.Lookup(ip, &city) if err != nil {