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/04/19 21:45:47 UTC
[4/8] incubator-trafficcontrol git commit: fix calls to get
domain_name from DS, remove method that is now unnecessary
fix calls to get domain_name from DS, remove method that is now unnecessary
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/b6c0c0c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/b6c0c0c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/b6c0c0c3
Branch: refs/heads/master
Commit: b6c0c0c3e5d63ffbe41df47b648ec0b61a72e3b1
Parents: 6f74da4
Author: David Neuman <da...@gmail.com>
Authored: Mon Apr 17 10:29:53 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Apr 19 15:45:00 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/DeliveryService.pm | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b6c0c0c3/traffic_ops/app/lib/UI/DeliveryService.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/DeliveryService.pm b/traffic_ops/app/lib/UI/DeliveryService.pm
index cf4732e..262e90b 100644
--- a/traffic_ops/app/lib/UI/DeliveryService.pm
+++ b/traffic_ops/app/lib/UI/DeliveryService.pm
@@ -50,7 +50,7 @@ sub edit {
my $data = $rs_ds->single;
my $regexp_set = &get_regexp_set( $self, $id );
- my $cdn_domain = $self->get_cdn_domain_by_ds_id($id);
+ my $cdn_domain = $data->cdn->domain_name;
my @example_urls = &get_example_urls( $self, $id, $regexp_set, $data, $cdn_domain, $data->protocol );
my $server_count = $self->db->resultset('DeliveryserviceServer')->search( { deliveryservice => $id } )->count();
@@ -71,13 +71,6 @@ sub edit {
);
}
-sub get_cdn_domain {
- my $self = shift;
- my $id = shift;
-
- return $self->db->resultset('Deliveryservice')->search( { id => $id }, { prefetch => ['cdn']} )->get_column('domain_name')->single();
-}
-
sub get_example_urls {
my $self = shift;
my $id = shift;
@@ -946,9 +939,9 @@ sub update {
}
else {
&stash_role($self);
- my $rs_ds = $self->db->resultset('Deliveryservice')->search( { 'me.id' => $id }, { prefetch => [ { 'type' => undef }, { 'profile' => undef } ] } );
+ my $rs_ds = $self->db->resultset('Deliveryservice')->search( { 'me.id' => $id }, { prefetch => [ { 'type' => undef }, { 'profile' => undef }, { 'cdn' => undef } ] } );
my $data = $rs_ds->single;
- my $cdn_domain = $self->get_cdn_domain_by_ds_id($id);
+ my $cdn_domain = $data->cdn->domain_name;
my $server_count = $self->db->resultset('DeliveryserviceServer')->search( { deliveryservice => $id } )->count();
my $static_count = $self->db->resultset('Staticdnsentry')->search( { deliveryservice => $id } )->count();
my $regexp_set = &get_regexp_set( $self, $id );
@@ -1007,7 +1000,6 @@ sub create {
}
if ( $self->check_deliveryservice_input($cdn_id) ) {
- #print "CDN:$cdn_id\n";
my $insert = $self->db->resultset('Deliveryservice')->create(
{
xml_id => $self->paramAsScalar('ds.xml_id'),
@@ -1177,13 +1169,12 @@ sub create_dnssec_keys {
my $dnskey_ttl = get_key_ttl( $cdn_ksk, "60" );
#create the ds domain name for dnssec keys
- my $domain_name = get_cdn_domain($self, $ds_id);
my $deliveryservice_regexes = get_regexp_set($self, $ds_id);
my $rs_ds =
- $self->db->resultset('Deliveryservice')->search( { 'me.xml_id' => $xml_id }, { prefetch => [ { 'type' => undef }, { 'profile' => undef } ] } );
+ $self->db->resultset('Deliveryservice')->search( { 'me.xml_id' => $xml_id }, { prefetch => [ { 'type' => undef }, { 'profile' => undef }, { 'cdn' => undef } ] } );
my $data = $rs_ds->single;
+ my $domain_name = $data->cdn->domain_name;
my @example_urls = get_example_urls( $self, $ds_id, $deliveryservice_regexes, $data, $domain_name, $data->protocol );
-
#first one is the one we want. period at end for dnssec, substring off stuff we dont want
my $ds_name = $example_urls[0] . ".";
my $length = length($ds_name) - CORE::index( $ds_name, "." );