From ea2ebaefbc7e895abdcd49a17595ec0d81dd5f3b Mon Sep 17 00:00:00 2001 From: Brett Granger Date: Mon, 5 May 2025 14:43:08 -0400 Subject: [PATCH] Minor changes to regional geoblocking: * updated a debug message to be a bit clearerr * return early from createRedirectURIString() if cache is null --- .../traffic_router/core/loc/RegionalGeo.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java index 10af8fa055..80b6744149 100644 --- a/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java +++ b/traffic_router/core/src/main/java/org/apache/traffic_control/traffic_router/core/loc/RegionalGeo.java @@ -433,7 +433,7 @@ public static void enforce(final TrafficRouter trafficRouter, final Request requ if(!"Denied".equals(redirectURIString)){ routeResult.addUrl(new URL(redirectURIString)); }else{ - LOGGER.warn("RegionalGeo: this needs a better error message, createRedirectURIString returned denied"); + LOGGER.debug("RegionalGeo: no availabe cache for relative path, 503 will be sent"); } } } @@ -468,6 +468,14 @@ private static void updateTrack(final Track track, final RegionalGeoResult regio private static String createRedirectURIString(final HTTPRequest request, final DeliveryService deliveryService, final Cache cache, final RegionalGeoResult regionalGeoResult) { + if (regionalGeoResult.getType() == ALTERNATE_WITHOUT_CACHE) { + return regionalGeoResult.getUrl(); + } + + if (cache == null) { + return "Denied"; + } + if (regionalGeoResult.getType() == ALLOWED) { return deliveryService.createURIString(request, cache); } @@ -476,10 +484,6 @@ private static String createRedirectURIString(final HTTPRequest request, final D return deliveryService.createURIString(request, regionalGeoResult.getUrl(), cache); } - if (regionalGeoResult.getType() == ALTERNATE_WITHOUT_CACHE) { - return regionalGeoResult.getUrl(); - } - return "Denied"; // DENIED }