Log errors (as traces)

Author: mostafa

plugin/scheduler.go

@@ -21,18 +21,43 @@ func (p *Plugin) PeriodicInvalidator() {
 		p.Logger.Trace("Got proxies from GatewayD", "proxies", proxies)
 
 		// Get all the client keys and delete the ones that are not valid.
+		// TODO: use scan instead of keys.
 		for _, address := range p.RedisClient.Keys(context.Background(), "*:*").Val() {
-			if validateAddressPort(address) || validateHostPort(address) {
-				// If the connection is busy, it is not safe to delete the key.
-				if isBusy(proxies, address) {
-					p.Logger.Trace("Skipping connection because it is busy", "address", address)
+			valid := false
+
+			// Validate the address if the address is an IP address.
+			if ok, err := validateAddressPort(address); ok && err == nil {
+				valid = true
+			} else {
+				p.Logger.Trace(
+					"Skipping connection because it is invalid", "address", address, "error", err)
+			}
+
+			if !valid {
+				// Validate the address if the address is a hostname.
+				if ok, err := validateHostPort(address); ok && err == nil {
+					valid = true
+				} else {
+					p.Logger.Trace(
+						"Skipping connection because it is invalid", "address", address, "error", err)
 					continue
 				}
+			}
 
-				p.RedisClient.Del(context.Background(), address)
-				p.Logger.Trace("Deleted address", "address", address)
-				CacheDeletesCounter.Inc()
+			// If the address is not valid, skip it.
+			if !valid {
+				continue
 			}
+
+			// If the connection is busy (a client is connected), it is not safe to delete the key.
+			if isBusy(proxies, address) {
+				p.Logger.Trace("Skipping connection because it is busy", "address", address)
+				continue
+			}
+
+			p.RedisClient.Del(context.Background(), address)
+			p.Logger.Trace("Deleted stale address", "address", address)
+			CacheDeletesCounter.Inc()
 		}
 	}); err != nil {
 		p.Logger.Error("Failed to start periodic invalidator",