This is an automated email from the ASF dual-hosted git repository. elsloo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit f8630a87396049e3581371a51963f3551e475e84 Author: Jesse Rivas <jesse_ri...@comcast.com> AuthorDate: Fri Feb 9 11:12:12 2018 -0700 changed param name to maxmind.default.override --- traffic_ops/app/lib/UI/Topology.pm | 12 ++++++------ .../traffic_router/core/router/TrafficRouter.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/traffic_ops/app/lib/UI/Topology.pm b/traffic_ops/app/lib/UI/Topology.pm index cd22716..1adb83e 100644 --- a/traffic_ops/app/lib/UI/Topology.pm +++ b/traffic_ops/app/lib/UI/Topology.pm @@ -153,18 +153,18 @@ sub gen_crconfig_json { } $data_obj->{'config'}->{'requestHeaders'} = $headers; } - elsif ( $param eq 'geolocation.default.override' ) { + elsif ( $param eq 'maxmind.default.override' ) { ( my $country_code, my $coordinates ) = split( /\;/, $row->parameter->value ); ( my $lat, my $long ) = split( /\,/, $coordinates ); my $geolocation = { 'countryCode' => "$country_code", - 'lat' => "$lat", - 'long' => "$long" + 'lat' => $lat + 0, + 'long' => $long + 0 }; - if ( !$data_obj->{'config'}->{'geolocationOverride'} ) { - $data_obj->{'config'}->{'geolocationOverride'} = []; + if ( !$data_obj->{'config'}->{'maxmindDefaultOverride'} ) { + $data_obj->{'config'}->{'maxmindDefaultOverride'} = []; } - push ( $data_obj->{'config'}->{'geolocationOverride'}, $geolocation ); + push ( $data_obj->{'config'}->{'maxmindDefaultOverride'}, $geolocation ); } elsif ( !exists $requested_param_names{$param} ) { $data_obj->{'config'}->{$param} = $row->parameter->value; diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java index 28c5184..471c8ea 100644 --- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java +++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java @@ -105,7 +105,7 @@ public class TrafficRouter { if (cr.getConfig() != null) { // geolocationOverride: {countryCode: , lat: , long: } - final JsonNode geolocations = cr.getConfig().get("geolocationOverride"); + final JsonNode geolocations = cr.getConfig().get("maxmindDefaultOverride"); if (geolocations != null) { for (final JsonNode geolocation : geolocations) { final String countryCode = JsonUtils.optString(geolocation, "countryCode"); -- To stop receiving notification emails like this one, please contact els...@apache.org.