[incubator-trafficcontrol] 05/08: modified crconfig diff for maxmindDefaultOverride param

[elsloo]

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 1d5c890d10476d0cdcd067ba94c5bcfe9f809fd3
Author: Jesse Rivas <jesse_ri...@comcast.com>
AuthorDate: Mon Feb 12 14:59:39 2018 -0700

    modified crconfig diff for maxmindDefaultOverride param
---
 traffic_ops/app/lib/UI/Topology.pm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/traffic_ops/app/lib/UI/Topology.pm 
b/traffic_ops/app/lib/UI/Topology.pm
index 1adb83e..ee0e750 100644
--- a/traffic_ops/app/lib/UI/Topology.pm
+++ b/traffic_ops/app/lib/UI/Topology.pm
@@ -162,9 +162,9 @@ sub gen_crconfig_json {
                 'long' => $long + 0
             };
             if ( !$data_obj->{'config'}->{'maxmindDefaultOverride'} ) {
-                $data_obj->{'config'}->{'maxmindDefaultOverride'} = [];
+                @{ $data_obj->{'config'}->{'maxmindDefaultOverride'} } = ();
             }
-            push ( $data_obj->{'config'}->{'maxmindDefaultOverride'}, 
$geolocation );
+            push ( @{ $data_obj->{'config'}->{'maxmindDefaultOverride'} }, 
$geolocation );
         }
         elsif ( !exists $requested_param_names{$param} ) {
             $data_obj->{'config'}->{$param} = $row->parameter->value;
@@ -681,11 +681,21 @@ sub crconfig_strings {
             foreach my $key ( sort keys %{ $config_json->{'config'}->{$cfg} } 
) {
                 $string .= "|$key:" . $config_json->{'config'}->{$cfg}->{$key};
             }
+            push( @config_strings, $string );
+        }
+        elsif ( $cfg eq 'maxmindDefaultOverride' ) {
+            foreach my $element ( @{ $config_json->{'config'}->{$cfg} } ) {
+                $string = "|param:$cfg";
+                foreach my $key ( sort keys %{ $element } ) {
+                    $string .= "|$key:" . $element->{$key};
+                }
+                push( @config_strings, $string );
+            }
         }
         else {
             $string = "|param:$cfg|value:" . $config_json->{'config'}->{$cfg} 
. "|";
+            push( @config_strings, $string );
         }
-        push( @config_strings, $string );
     }
     foreach my $rascal ( sort keys %{ $config_json->{'monitors'} } ) {
         my $return = &stringify_rascal( $config_json->{'monitors'}->{$rascal} 
);

-- 
To stop receiving notification emails like this one, please contact
els...@apache.org.