feat: lazy cache scrub

dns/cache/dns_cache.go

@@ -9,23 +9,41 @@ import (
 
 type DNSCacheEntry struct {
 	ip     string
-	expiry_timer *time.Timer
+	expiry time.Time
 }
 
 type DNSCache struct {
 	cacheMap        map[string]DNSCacheEntry
 	cacheLock       sync.RWMutex
+	scrubbingTicker *time.Ticker
 }
 
 var dnsCache *DNSCache
 var once sync.Once
 
+func scrubDNSCache() {
+	for {
+		<-dnsCache.scrubbingTicker.C
+		dnsCache.cacheLock.Lock()
+		for k, v := range dnsCache.cacheMap {
+			if v.expiry.Before(time.Now()) {
+				delete(dnsCache.cacheMap, k)
+			}
+		}
+		dnsCache.cacheLock.Unlock()
+	}
+}
+
 func GetCache() *DNSCache {
 	once.Do(func() {
 		dnsCache = &DNSCache{
 			cacheMap:  make(map[string]DNSCacheEntry),
 			cacheLock: sync.RWMutex{},
+
+			scrubbingTicker: time.NewTicker(time.Duration(1 * time.Hour)), // Hourly cache scrub
 		}
+
+		go scrubDNSCache()
 	})
 	return dnsCache
 }
@@ -40,21 +58,30 @@ func (d *DNSCache) Set(key string, value string) {
 
 	d.cacheMap[key] = DNSCacheEntry{
 		ip:     value,
-		expiry_timer: time.AfterFunc(time.Duration(*&util.GetConfig().DnsCacheTTL)*time.Second, func() {
+		expiry: time.Now().Add(time.Duration(*&util.GetConfig().DnsCacheTTL) * time.Second),
-			d.cacheLock.Lock()
-			defer d.cacheLock.Unlock()
-			delete(d.cacheMap, key)
-		}),
 	}
 }
 
 func (d *DNSCache) Get(key string) (string, bool) {
-	d.cacheLock.RLock()
+	d.cacheLock.RLock() // Read lock
-	defer d.cacheLock.RUnlock()
 
 	if value, ok := d.cacheMap[key]; ok {
-		return value.ip, true
+		if value.expiry.Before(time.Now()) {
-	}
+			ip := value.ip
+
+			d.cacheLock.RUnlock() // Read unlock
+			return ip, true
+		} else {
+			d.cacheLock.RUnlock() // Read unlock
+
+			d.cacheLock.Lock() // Lock for writing
+			delete(d.cacheMap, key)
+			d.cacheLock.Unlock() // Unlock
 
+			return "", false
+		}
+	}
+
+	d.cacheLock.RUnlock() // Read unlock
 	return "", false
 }