trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dewr...@apache.org
Subject [4/4] incubator-trafficcontrol git commit: Update Dnsseckeys.pm and Sslkeys.pm to no longer us get_cdn_domain method. This fixes TC-255
Date Tue, 02 May 2017 17:21:47 GMT
Update Dnsseckeys.pm and Sslkeys.pm to no longer us get_cdn_domain method.  This fixes TC-255


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3c430d6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3c430d6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3c430d6f

Branch: refs/heads/master
Commit: 3c430d6f38dbfcd9a151fbbca5b49f4338df1488
Parents: 0081a56
Author: David Neuman <david.neuman64@gmail.com>
Authored: Wed Apr 26 13:09:20 2017 -0600
Committer: Dewayne Richardson <dewrich@apache.org>
Committed: Tue May 2 11:20:57 2017 -0600

----------------------------------------------------------------------
 traffic_ops/app/lib/MojoPlugins/DnssecKeys.pm | 6 ++----
 traffic_ops/app/lib/UI/SslKeys.pm             | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3c430d6f/traffic_ops/app/lib/MojoPlugins/DnssecKeys.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/MojoPlugins/DnssecKeys.pm b/traffic_ops/app/lib/MojoPlugins/DnssecKeys.pm
index d2c62da..fc9dfe8 100755
--- a/traffic_ops/app/lib/MojoPlugins/DnssecKeys.pm
+++ b/traffic_ops/app/lib/MojoPlugins/DnssecKeys.pm
@@ -92,8 +92,7 @@ sub register {
 
 			#then get deliveryservices
 			my %search = ( profile => $profile_id );
-			my @ds_rs
-				= $self->db->resultset('Deliveryservice')->search( \%search );
+			my @ds_rs = $self->db->resultset('Deliveryservice')->search( \%search , { prefetch
=> [ { 'cdn' => undef }]});
 			foreach my $ds (@ds_rs) {
 				if (   $ds->type->name !~ m/^HTTP/
 					&& $ds->type->name !~ m/^DNS/ )
@@ -104,8 +103,7 @@ sub register {
 				my $ds_id  = $ds->id;
 
 				#create the ds domain name for dnssec keys
-				my $domain_name
-					= UI::DeliveryService::get_cdn_domain( $self, $ds_id );
+				my $domain_name = $ds->cdn->domain_name;
 				my $ds_regexes
 					= UI::DeliveryService::get_regexp_set( $self, $ds_id );
 				my $rs_ds = $self->db->resultset('Deliveryservice')->search(

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3c430d6f/traffic_ops/app/lib/UI/SslKeys.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/SslKeys.pm b/traffic_ops/app/lib/UI/SslKeys.pm
index d583a38..731e3d0 100644
--- a/traffic_ops/app/lib/UI/SslKeys.pm
+++ b/traffic_ops/app/lib/UI/SslKeys.pm
@@ -80,7 +80,7 @@ sub get_hostname {
 	my $ds_id = shift;
 	my $data = shift;
 
-	my $domain_name     = UI::DeliveryService::get_cdn_domain( $self, $ds_id );
+	my $domain_name = $data->cdn->domain_name;
 	my $ds_regexes      = UI::DeliveryService::get_regexp_set( $self, $ds_id );
 	my @example_urls    = UI::DeliveryService::get_example_urls( $self, $ds_id, $ds_regexes,
$data, $domain_name, $data->protocol );
 


Mime
View raw message