You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/03/16 21:09:26 UTC
[28/29] incubator-trafficcontrol git commit: fix revalidate in use
checks
fix revalidate in use checks
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/b94ad3c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/b94ad3c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/b94ad3c9
Branch: refs/heads/master
Commit: b94ad3c9336eeba5bf9bb9e8badf92f698b043b4
Parents: c879717
Author: Derek Gelinas <mr...@gmail.com>
Authored: Wed Mar 15 21:53:27 2017 +0000
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Mar 16 15:08:24 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm | 8 ++++----
traffic_ops/app/lib/UI/Server.pm | 5 ++++-
traffic_ops/bin/traffic_ops_ort.pl | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b94ad3c9/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
index 241a383..1485da6 100644
--- a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
+++ b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
@@ -63,8 +63,8 @@ sub get_config_metadata {
my %condition = ( 'me.host_name' => $host_name );
my $rs_server = $self->db->resultset('Server')->search( \%condition, { prefetch => [ 'cdn', 'profile' ] } );
- my $to_url = $self->db->resultset('Parameter')->search( { -and => [ name => 'tm.url', config_file => 'global' ] } )->get_column('value')->first();
- my $to_cache_url = $self->db->resultset('Parameter')->search( { -and => [ name => 'tm_cache.url', config_file => 'global' ] } )->get_column('value')->first();
+ my $tm_url = $self->db->resultset('Parameter')->search( { -and => [ name => 'tm.url', config_file => 'global' ] } )->get_column('value')->first();
+ my $tm_cache_url = $self->db->resultset('Parameter')->search( { -and => [ name => 'tm_cache.url', config_file => 'global' ] } )->get_column('value')->first();
my $cdn_name = $server_obj->cdn->name;
my $server = $rs_server->next;
if ($server) {
@@ -75,9 +75,9 @@ sub get_config_metadata {
$data_obj->{'info'}->{'profile_id'} = $server->profile->id;
$data_obj->{'info'}->{'cdn_name'} = $cdn_name;
$data_obj->{'info'}->{'cdn_id'} = $server->cdn->id;
- $data_obj->{'info'}->{'to_url'} = $to_url;
+ $data_obj->{'info'}->{'to_url'} = $tm_url;
if ( $tm_cache_url ) {
- $data_obj->{'info'}->{'to_cache_url'} = $to_cache_url;
+ $data_obj->{'info'}->{'to_cache_url'} = $tm_cache_url;
}
#$data_obj->{'profile'}->{'name'} = $server->profile->name;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b94ad3c9/traffic_ops/app/lib/UI/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Server.pm b/traffic_ops/app/lib/UI/Server.pm
index 987c698..8477162 100644
--- a/traffic_ops/app/lib/UI/Server.pm
+++ b/traffic_ops/app/lib/UI/Server.pm
@@ -926,14 +926,17 @@ sub readupdate {
}
}
+ my $use_reval_pending = $self->db->resultset('Parameter')->search( { -and => [ 'name' => 'use_reval_pending', 'config_file' => 'global' ] } )->get_column('value')->single;
+
while ( my $row = $rs_servers->next ) {
my $parent_pending_flag = $parent_pending{ $row->host_name } ? 1 : 0;
my $parent_reval_pending_flag = $parent_reval_pending{ $row->host_name } ? 1 : 0;
+ my $reval_pending_flag = ($use_reval_pending) && $use_reval_pending ne '0' ? \$row->reval_pending : undef;
push(
@data, {
host_name => $row->host_name,
upd_pending => \$row->upd_pending,
- reval_pending => \$row->reval_pending,
+ reval_pending => $reval_pending_flag,
host_id => $row->id,
status => $row->status->name,
parent_pending => \$parent_pending_flag,
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b94ad3c9/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index 91c59fe..524a76c 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -69,7 +69,7 @@ my $TM_LOGIN = undef;
if ( defined( $ARGV[2] ) ) {
if ( $ARGV[2] !~ /^https*:\/\/.*$/ ) {
&usage();
-
+ }
else {
$traffic_ops_host = $ARGV[2];
$traffic_ops_host =~ s/\/*$//g;