You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by zr...@apache.org on 2025/05/05 20:00:39 UTC
(trafficcontrol) branch master updated: Synamedia minor changes to regional geoblocking (#8126)
This is an automated email from the ASF dual-hosted git repository.
zrhoffman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 37a0b2f692 Synamedia minor changes to regional geoblocking (#8126)
37a0b2f692 is described below
commit 37a0b2f692586402763d64733adc57859f00d192
Author: Brett Granger <68...@users.noreply.github.com>
AuthorDate: Mon May 5 16:00:33 2025 -0400
Synamedia minor changes to regional geoblocking (#8126)
Minor changes to regional geoblocking:
* updated a debug message to be a bit clearerr
* return early from createRedirectURIString() if cache is null
Co-authored-by: Brett Granger <bg...@synamedia.com>
---
.../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 final class RegionalGeo {
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 @@ public final class RegionalGeo {
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 @@ public final class RegionalGeo {
return deliveryService.createURIString(request, regionalGeoResult.getUrl(), cache);
}
- if (regionalGeoResult.getType() == ALTERNATE_WITHOUT_CACHE) {
- return regionalGeoResult.getUrl();
- }
-
return "Denied"; // DENIED
}