Merge pull request #6048 from mysteriumnetwork/fix-location-cache

Fix location cache gets never updated sometimes
mysteriumnetwork · May 16, 2024 · 365054f · 365054f
2 parents c97221a + bc3b56e
commit 365054f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/core/location/cache.go b/core/location/cache.go
@@ -56,7 +56,7 @@ func NewCache(resolver Resolver, pub publisher, expiry time.Duration) *Cache {
 }
 
 func (c *Cache) needsRefresh() bool {
-	return c.lastFetched.IsZero() || c.lastFetched.After(time.Now().Add(-c.expiry))
+	return c.lastFetched.IsZero() || c.lastFetched.Before(time.Now().Add(-c.expiry))
 }
 
 func (c *Cache) fetchAndSave() (locationstate.Location, error) {
@@ -72,6 +72,7 @@ func (c *Cache) fetchAndSave() (locationstate.Location, error) {
 		c.location = loc
 		c.lastFetched = time.Now()
 	}
+
 	return loc, err
 }
 
@@ -90,6 +91,7 @@ func (c *Cache) DetectLocation() (locationstate.Location, error) {
 	if !c.needsRefresh() {
 		return c.location, nil
 	}
+
 	return c.fetchAndSave()
 }
 

diff --git a/core/location/cache_test.go b/core/location/cache_test.go
@@ -46,15 +46,15 @@ func TestCache_needsRefresh(t *testing.T) {
 			name: "returns true if expired",
 			want: true,
 			fields: fields{
-				lastFetched: time.Now().Add(time.Second * -59),
+				lastFetched: time.Now().Add(time.Second * -69),
 				expiry:      time.Minute * 1,
 			},
 		},
 		{
 			name: "returns false if updated recently",
 			want: false,
 			fields: fields{
-				lastFetched: time.Now().Add(time.Second * -61),
+				lastFetched: time.Now().Add(time.Second * -50),
 				expiry:      time.Minute * 1,
 			},
 		},