Adjust cache to private variable
This commit is contained in:
parent
41605f743a
commit
20b21c0221
3 changed files with 24 additions and 6 deletions
|
@ -51,7 +51,7 @@ func searchIPCtx(next http.Handler) http.Handler {
|
|||
return
|
||||
}
|
||||
|
||||
newipnet, found := geoloc.IPCache.Get(ipnetnum)
|
||||
newipnet, found := geoloc.GetCacheContent(ipnetnum)
|
||||
if found {
|
||||
ipnetnum = newipnet
|
||||
}
|
||||
|
@ -63,7 +63,7 @@ func searchIPCtx(next http.Handler) http.Handler {
|
|||
}
|
||||
|
||||
if !found {
|
||||
geoloc.IPCache.Set(ipnetnum, ipinfo.IPNumFrom, 2*time.Minute)
|
||||
geoloc.SetCacheContent(ipnetnum, ipinfo.IPNumFrom, 2*time.Minute)
|
||||
}
|
||||
}
|
||||
ctx := context.WithValue(r.Context(), keyIPInfo, ipinfo)
|
||||
|
|
3
main.go
3
main.go
|
@ -41,9 +41,6 @@ func main() {
|
|||
}
|
||||
fmt.Println("Import data from file successful")
|
||||
|
||||
geoloc.IPCache = geoloc.NewCache()
|
||||
fmt.Println("Cache created")
|
||||
|
||||
r := chi.NewRouter()
|
||||
r.Use(middleware.RequestID)
|
||||
r.Use(middleware.Logger)
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"time"
|
||||
)
|
||||
|
||||
var IPCache *Cache
|
||||
var ipCache *Cache
|
||||
|
||||
type Cache struct {
|
||||
store sync.Map
|
||||
|
@ -27,3 +27,24 @@ func (c *Cache) Get(key uint) (uint, bool) {
|
|||
value, ok := output.(uint)
|
||||
return value, ok
|
||||
}
|
||||
|
||||
func createCache() {
|
||||
ipCache = NewCache()
|
||||
}
|
||||
|
||||
func GetCacheContent(key uint) (uint, bool) {
|
||||
if ipCache == nil {
|
||||
createCache()
|
||||
return 0, false
|
||||
}
|
||||
|
||||
return ipCache.Get(key)
|
||||
}
|
||||
|
||||
func SetCacheContent(key, value uint, ttl time.Duration) {
|
||||
if ipCache == nil {
|
||||
createCache()
|
||||
}
|
||||
|
||||
ipCache.Set(key, value, ttl)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue