You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/05/02 17:21:44 UTC
[1/4] incubator-trafficcontrol git commit: This closes #522
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 0081a56a2 -> 54b78aaae
This closes #522
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/54b78aaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/54b78aaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/54b78aaa
Branch: refs/heads/master
Commit: 54b78aaae67e2b4a4930fc99b066227eded838fa
Parents: bf3a7ec
Author: Dewayne Richardson <de...@apache.org>
Authored: Tue May 2 11:20:57 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 2 11:20:57 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/4] incubator-trafficcontrol git commit: Update Dnsseckeys.pm and
Sslkeys.pm to no longer us get_cdn_domain method. This fixes TC-255
Posted by de...@apache.org.
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 <da...@gmail.com>
Authored: Wed Apr 26 13:09:20 2017 -0600
Committer: Dewayne Richardson <de...@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 );
[3/4] incubator-trafficcontrol git commit: removes ambiguous column
reference
Posted by de...@apache.org.
removes ambiguous column reference
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bf3a7ecc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bf3a7ecc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bf3a7ecc
Branch: refs/heads/master
Commit: bf3a7eccf97ed0141e50dd6d5f71bacba8a9e401
Parents: 696aed4
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Mon May 1 15:01:04 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 2 11:20:57 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/DnssecKeys.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/bf3a7ecc/traffic_ops/app/lib/UI/DnssecKeys.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/DnssecKeys.pm b/traffic_ops/app/lib/UI/DnssecKeys.pm
index 97ec1e9..e255e7d 100644
--- a/traffic_ops/app/lib/UI/DnssecKeys.pm
+++ b/traffic_ops/app/lib/UI/DnssecKeys.pm
@@ -239,7 +239,7 @@ sub create {
}
#create keys
- my $profile = $self->db->resultset('Profile')->search( { id => $profile_id }, { prefetch => ['cdn'] } )->single();
+ my $profile = $self->db->resultset('Profile')->search( { 'me.id' => $profile_id }, { prefetch => ['cdn'] } )->single();
my $domain_name = $profile->cdn->domain_name;
my $response_container = $self->riak_ping();
[2/4] incubator-trafficcontrol git commit: Fixes the ability to add a
DS without a profile. This fixes TC-256
Posted by de...@apache.org.
Fixes the ability to add a DS without a profile. This fixes TC-256
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/696aed4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/696aed4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/696aed4f
Branch: refs/heads/master
Commit: 696aed4f09d0d322524b56e03abb0d7a80b8d7a4
Parents: 3c430d6
Author: David Neuman <da...@gmail.com>
Authored: Wed Apr 26 13:10:04 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 2 11:20:57 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/DeliveryService.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/696aed4f/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 6e4428f..7e63fba 100644
--- a/traffic_ops/app/lib/UI/DeliveryService.pm
+++ b/traffic_ops/app/lib/UI/DeliveryService.pm
@@ -1021,7 +1021,7 @@ sub create {
ccr_dns_ttl => $self->paramAsScalar('ds.ccr_dns_ttl'),
type => $self->paramAsScalar('ds.type'),
cdn_id => $cdn_id,
- profile => $self->paramAsScalar('ds.profile'),
+ profile => ($self->paramAsScalar('ds.profile') == -1) ? undef : $self->paramAsScalar('ds.profile'),
global_max_mbps => $self->hr_string_to_mbps( $self->paramAsScalar( 'ds.global_max_mbps', 0 ) ),
global_max_tps => $self->paramAsScalar( 'ds.global_max_tps', 0 ),
miss_lat => $self->paramAsScalar('ds.miss_lat'),