You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2017/05/09 22:19:15 UTC
[1/2] incubator-trafficcontrol git commit: fix error when DS profile
was not defined
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 8927437fb -> 525081463
fix error when DS profile was not defined
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/cb1b1ebb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/cb1b1ebb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/cb1b1ebb
Branch: refs/heads/master
Commit: cb1b1ebb35366be30273607676853afbf1c7d3d9
Parents: 8927437
Author: David Neuman <da...@gmail.com>
Authored: Tue May 9 16:06:59 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue May 9 16:18:48 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/DeliveryService.pm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/cb1b1ebb/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 59ecde0..819dc97 100644
--- a/traffic_ops/app/lib/UI/DeliveryService.pm
+++ b/traffic_ops/app/lib/UI/DeliveryService.pm
@@ -588,10 +588,13 @@ sub header_rewrite {
if ( $tier eq "mid" ) {
my @mtype_ids = &type_ids( $self, 'MID%', 'server' );
my $param = $self->db->resultset('Deliveryservice')->search( { 'me.profile' => $ds_profile }, { prefetch => 'cdn' } );
- $cdn_name = $param->next->cdn->name;
+ if (defined($param->next)) {
+ $cdn_name = $param->next->cdn->name;
+ }
@servers = $self->db->resultset('Server')->search( { type => { -in => \@mtype_ids } } )->get_column('id')->all();
}
+
my @profiles = $self->db->resultset('Server')->search( { id => { -in => \@servers } } )->get_column('profile')->all();
foreach my $profile_id (@profiles) {
my $link = $self->db->resultset('ProfileParameter')->search( { profile => $profile_id, parameter => $param_id } )->single();
[2/2] incubator-trafficcontrol git commit: This closes #563.
Posted by da...@apache.org.
This closes #563.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/52508146
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/52508146
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/52508146
Branch: refs/heads/master
Commit: 525081463be0338d82beca135ee6a5a9d3becdb2
Parents: cb1b1eb
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue May 9 16:19:10 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue May 9 16:19:10 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------