[incubator-trafficcontrol] branch master updated: if .cer file order changed, force update

[mtorluemke]

This is an automated email from the ASF dual-hosted git repository.

mtorluemke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new 01e417c  if .cer file order changed, force update
01e417c is described below

commit 01e417cf77eac526a8cd6d6293ed7603d3b93f51
Author: Dan Kirkwood <dang...@apache.org>
AuthorDate: Fri Apr 6 17:38:46 2018 -0600

    if .cer file order changed, force update
---
 traffic_ops/bin/traffic_ops_ort.pl | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/traffic_ops/bin/traffic_ops_ort.pl 
b/traffic_ops/bin/traffic_ops_ort.pl
index 32d25ba..32a8e99 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -385,19 +385,29 @@ sub process_cfg_file {
                @disk_file_lines = @{ &open_file_get_contents($file) };
        }
 
-       my @return             = &diff_file_lines( $cfg_file, \@db_file_lines, 
\@disk_file_lines );
-       my @db_lines_missing   = @{ shift(@return) };
-       my @disk_lines_missing = @{ shift(@return) };
+       # First, check if the file to be generated would be identical including 
order
+       my $change_needed = ( join( '\0', @disk_file_lines ) ne join( '\0', 
@db_file_lines ) );
 
-       if ( ($cfg_file eq "logs_xml.config" && !(@disk_file_lines ~~ 
@db_file_lines))
-               || scalar(@disk_lines_missing) || scalar(@db_lines_missing) ) {
-               $cfg_file_tracker->{$cfg_file}->{'change_needed'}++;
+       # if different, look deeper to see if we care about the diffs (e.g. 
different order)
+       if ( $change_needed && !( $cfg_file eq 'logs_xml.config' || $cfg_file 
=~ /\.cer$/ ) ) {
+               my @return             = &diff_file_lines( $cfg_file, 
\@db_file_lines, \@disk_file_lines );
+               my @db_lines_missing   = @{ shift(@return) };
+               my @disk_lines_missing = @{ shift(@return) };
+
+               if ( scalar(@disk_lines_missing) == 0 && 
scalar(@db_lines_missing) == 0 ) {
+                       # all lines accounted for
+                       $change_needed = undef;
+               }
+       }
+
+       if ($change_needed) {
+               $cfg_file_tracker->{$cfg_file}{'change_needed'}++;
                ( $log_level >> $DEBUG ) && print "DEBUG $file needs 
updated.\n";
                &backup_file( $cfg_file, \$result );
        }
        else {
                ( $log_level >> $INFO ) && print "INFO: All lines match TrOps 
for config file: $cfg_file.\n";
-               $cfg_file_tracker->{$cfg_file}->{'change_needed'} = 0;
+               $cfg_file_tracker->{$cfg_file}{'change_needed'} = 0;
                ( $log_level >> $TRACE ) && print "TRACE Setting change not 
needed for $cfg_file.\n";
                $return_code = $CFG_FILE_UNCHANGED;
        }

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