Adding support for Memcached

Adding support for providing a url for Memcached either locally or remotely.
data-preservation-programs · Aug 16, 2023 · 822596a · 822596a
1 parent 887cbcd
commit 822596a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/pkg/resolver/location_resolver.go b/pkg/resolver/location_resolver.go
@@ -116,27 +116,34 @@ func GetPublicIPInfo(ctx context.Context, ip string, token string) (IPInfo, erro
 }
 
 type LocationResolver struct {
+	localCache  *ttlcache.Cache[string, IPInfo]
 	localCache  *ttlcache.Cache[string, IPInfo]
 	ipInfoToken string
 	remoteTTL   int
 }
 
 type LocationCachePayload struct {
-	Ip         string `json:"ip"`
-	Ip_payload []byte `json:"ip_payload"`
-	RemoteTTL  int    `json:"ttl"`
+	IP        string `json:"ip"`
+	IPPayload []byte `json:"ipPayload"`
+	RemoteTTL int    `json:"ttl"`
 }
 
+func NewLocationResolver(ipInfoToken string, localTTL time.Duration, remoteTTL int) LocationResolver {
+	localCache := ttlcache.New[string, IPInfo](
 func NewLocationResolver(ipInfoToken string, localTTL time.Duration, remoteTTL int) LocationResolver {
 	localCache := ttlcache.New[string, IPInfo](
 		//nolint:gomnd
 		ttlcache.WithTTL[string, IPInfo](localTTL),
+		ttlcache.WithTTL[string, IPInfo](localTTL),
 		ttlcache.WithDisableTouchOnHit[string, IPInfo]())
 
+
 	return LocationResolver{
+		localCache,
 		localCache,
 		ipInfoToken,
 		remoteTTL,
+		remoteTTL,
 	}
 }
 
@@ -147,12 +154,14 @@ func (l LocationResolver) ResolveIP(ctx context.Context, ip net.IP) (IPInfo, err
 		return ipInfo.Value(), nil
 	}
 
-	// 90% of the time we will try to check the remote cache
-	if os.Getenv("IP_INFO_CACHE_URL") != "" && rand.Intn(10) != 0 {
+	if os.Getenv("IP_INFO_CACHE_URL") != "" {
 		response, _ := http.NewRequestWithContext(context.Background(), http.MethodGet, os.Getenv("IP_INFO_CACHE_URL")+"/getIpInfo?ip="+ipString, nil)
 		var ipInfo IPInfo
 		if response.Response.StatusCode == http.StatusOK && response.Body != nil {
-			json.NewDecoder(response.Body).Decode(&ipInfo)
+			err := json.NewDecoder(response.Body).Decode(&ipInfo)
+			if err != nil {
+				return IPInfo{}, errors.Wrap(err, "failed to decode IP info")
+			}
 			return ipInfo, nil
 		}
 	}
@@ -174,7 +183,7 @@ func (l LocationResolver) ResolveIP(ctx context.Context, ip net.IP) (IPInfo, err
 		if err != nil {
 			return IPInfo{}, errors.Wrap(err, "Could not serialize IPInfo")
 		}
-		http.NewRequestWithContext(context.Background(), http.MethodPost, os.Getenv("IP_INFO_CACHE_URL"), bytes.NewReader(requestBody))
+		_, _ = http.NewRequestWithContext(context.Background(), http.MethodPost, os.Getenv("IP_INFO_CACHE_URL"), bytes.NewReader(requestBody))
 	}
 	return ipInfo, nil
 }

diff --git a/pkg/resolver/provider_resolver.go b/pkg/resolver/provider_resolver.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
-	"math/rand"
 	"net/http"
 	"os"
 	"time"
@@ -33,7 +32,7 @@ type MinerInfo struct {
 
 type ProviderCachePayload struct {
 	Provider        string `json:"provider"`
-	ProviderPayload []byte `json:"provider_payload"`
+	ProviderPayload []byte `json:"providerPayload"`
 	TTL             int    `json:"ttl" default:"3600"`
 }
 
@@ -68,7 +67,7 @@ func (p *ProviderResolver) ResolveProvider(ctx context.Context, provider string)
 		return minerInfo.Value(), nil
 	}
 
-	if os.Getenv("PROVIDER_CACHE_URL") != "" && rand.Intn(5) == 0 {
+	if os.Getenv("PROVIDER_CACHE_URL") != "" {
 		response, _ := http.NewRequestWithContext(context.Background(), http.MethodGet,
 			os.Getenv("PROVIDER_CACHE_URL")+"/getProviderInfo?provider="+provider, nil)
 
@@ -109,7 +108,7 @@ func (p *ProviderResolver) ResolveProvider(ctx context.Context, provider string)
 			return MinerInfo{}, errors.Wrap(err, "Could not serialize MinerInfo")
 		}
 
-		http.NewRequestWithContext(context.Background(), http.MethodPost, os.Getenv("PROVIDER_CACHE_URL"), bytes.NewReader(requestBody))
+		_, _ = http.NewRequestWithContext(context.Background(), http.MethodPost, os.Getenv("PROVIDER_CACHE_URL"), bytes.NewReader(requestBody))
 	}
 
 	return *minerInfo, nil