Repository: incubator-trafficcontrol Updated Branches: refs/heads/master f90fa69df -> b1842dc0a
cleanup remove debugs Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a6b451b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a6b451b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a6b451b3 Branch: refs/heads/master Commit: a6b451b33b2054f2707dce06d38f3c438e818a32 Parents: 5bf0ae7 Author: Jan van Doorn <j...@apache.org> Authored: Sat Feb 11 23:22:21 2017 +0000 Committer: Jan van Doorn <j...@apache.org> Committed: Fri Feb 17 17:49:10 2017 +0000 ---------------------------------------------------------------------- .../app/lib/API/DeliveryService/SslKeys.pm | 1 - traffic_ops/app/lib/API/Deliveryservice.pm | 9 ----- traffic_ops/app/lib/API/Profile.pm | 1 - .../app/lib/Fixtures/Integration/Parameter.pm | 2 +- .../app/lib/Fixtures/ProfileParameter.pm | 42 -------------------- .../Result/DeliveryServiceInfoForDomainList.pm | 2 +- traffic_ops/app/lib/UI/DeliveryService.pm | 10 ++--- 7 files changed, 7 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a6b451b3/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm b/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm index 985b171..c392006 100644 --- a/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm +++ b/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm @@ -158,7 +158,6 @@ sub view_by_hostname { my @ds_ids_regex = $self->db->resultset('Deliveryservice') ->search( { 'regex.pattern' => "$host_regex" }, { join => { deliveryservice_regexes => { regex => undef } } } )->get_column('id')->all(); - # TODO JvD - test this with online riak servers! my $cdn_id = $self->db->resultset('Cdn')->search( { domain_name => $domain_name } )->get_column('id')->single(); my@domain_profiles = $self->db->resultset('Profile')->search( { cdn => $cdn_id } )->get_column('id')->all(); http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a6b451b3/traffic_ops/app/lib/API/Deliveryservice.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/API/Deliveryservice.pm b/traffic_ops/app/lib/API/Deliveryservice.pm index b7eb1f9..fd91af2 100644 --- a/traffic_ops/app/lib/API/Deliveryservice.pm +++ b/traffic_ops/app/lib/API/Deliveryservice.pm @@ -93,7 +93,6 @@ sub index { "missLat" => defined($row->miss_lat) ? 0.0 + $row->miss_lat : undef, "missLat" => defined($row->miss_long) ? 0.0 + $row->miss_long : undef, "multiSiteOrigin" => \$row->multi_site_origin, - # "multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm, "orgServerFqdn" => $row->org_server_fqdn, "originShield" => $row->origin_shield, "profileId" => defined($row->profile) ? $row->profile->id : undef, @@ -190,7 +189,6 @@ sub show { "missLat" => defined($row->miss_lat) ? 0.0 + $row->miss_lat : undef, "missLat" => defined($row->miss_long) ? 0.0 + $row->miss_long : undef, "multiSiteOrigin" => \$row->multi_site_origin, - # "multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm, "orgServerFqdn" => $row->org_server_fqdn, "originShield" => $row->origin_shield, "profileId" => $row->profile->id, @@ -225,7 +223,6 @@ sub update { } my ( $is_valid, $result ) = $self->is_deliveryservice_valid($params); - print ">>>> " . $is_valid . " > < " . $result . "\n"; if ( !$is_valid ) { return $self->alert($result); } @@ -275,7 +272,6 @@ sub update { miss_lat => $params->{missLat}, miss_long => $params->{missLong}, multi_site_origin => $params->{multiSiteOrigin}, - # multi_site_origin_algorithm => $params->{multiSiteOriginAlgorithm}, org_server_fqdn => $params->{orgServerFqdn}, origin_shield => $params->{originShield}, profile => $params->{profileId}, @@ -338,7 +334,6 @@ sub update { "missLat" => 0.0 + $rs->miss_lat, "missLong" => 0.0 + $rs->miss_long, "multiSiteOrigin" => $rs->multi_site_origin, - # "multiSiteOriginAlgorithm" => $rs->multi_site_origin_algorithm, "orgServerFqdn" => $rs->org_server_fqdn, "originShield" => $rs->origin_shield, "profileId" => $rs->profile->id, @@ -421,7 +416,6 @@ sub create { miss_lat => $params->{missLat}, miss_long => $params->{missLong}, multi_site_origin => $params->{multiSiteOrigin}, - # multi_site_origin_algorithm => $params->{multiSiteOriginAlgorithm}, org_server_fqdn => $params->{orgServerFqdn}, origin_shield => $params->{originShield}, profile => $params->{profileId}, @@ -494,7 +488,6 @@ sub create { "missLat" => $insert->miss_lat, "missLong" => $insert->miss_long, "multiSiteOrigin" => $insert->multi_site_origin, - #"multiSiteOriginAlgorithm" => $insert->multi_site_origin_algorithm, "orgServerFqdn" => $insert->org_server_fqdn, "originShield" => $insert->origin_shield, "profileId" => $insert->profile->id, @@ -607,7 +600,6 @@ sub get_deliveryservices_by_serverId { "missLat" => $row->miss_lat, "missLong" => $row->miss_long, "multiSiteOrigin" => \$row->multi_site_origin, - "multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm, "orgServerFqdn" => $row->org_server_fqdn, "originShield" => $row->origin_shield, "profileId" => $row->profile->id, @@ -682,7 +674,6 @@ sub get_deliveryservices_by_userId { "missLat" => $row->miss_lat, "missLong" => $row->miss_long, "multiSiteOrigin" => \$row->multi_site_origin, - "multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm, "orgServerFqdn" => $row->org_server_fqdn, "originShield" => $row->origin_shield, "profileId" => $row->profile->id, http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a6b451b3/traffic_ops/app/lib/API/Profile.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/API/Profile.pm b/traffic_ops/app/lib/API/Profile.pm index 7e05f47..065cd59 100644 --- a/traffic_ops/app/lib/API/Profile.pm +++ b/traffic_ops/app/lib/API/Profile.pm @@ -124,7 +124,6 @@ sub show { sub create { my $self = shift; - print "KK:\n"; my $params = $self->req->json; if ( !defined($params) ) { return $self->alert("parameters must be in JSON format, please check!"); http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a6b451b3/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm b/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm index 9633bdb..66384a6 100644 --- a/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm +++ b/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm @@ -18,7 +18,7 @@ package Fixtures::Integration::Parameter; # under the License. -# Note - removing the NODNAME parameter wreaks all kinds of havoc because of ordering / id problems, so I renamed +# Note - removing the domain_name parameter wreaks all kinds of havoc because of ordering / id problems, so I renamed # it to NODNAME - JvD use Moose; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a6b451b3/traffic_ops/app/lib/Fixtures/ProfileParameter.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/Fixtures/ProfileParameter.pm b/traffic_ops/app/lib/Fixtures/ProfileParameter.pm index 20864b2..87cad71 100644 --- a/traffic_ops/app/lib/Fixtures/ProfileParameter.pm +++ b/traffic_ops/app/lib/Fixtures/ProfileParameter.pm @@ -19,48 +19,6 @@ use namespace::autoclean; use Digest::SHA1 qw(sha1_hex); my %definition_for = ( - # domain_name => { - # new => 'ProfileParameter', - # using => { - # profile => 100, - # parameter => 3, - # }, - # }, - # domain_name2 => { - # new => 'ProfileParameter', - # using => { - # profile => 200, - # parameter => 3, - # }, - # }, - # domain_name3 => { - # new => 'ProfileParameter', - # using => { - # profile => 300, - # parameter => 3, - # }, - # }, - # domain_name5 => { - # new => 'ProfileParameter', - # using => { - # profile => 500, - # parameter => 3, - # }, - # }, - # domain_name6 => { - # new => 'ProfileParameter', - # using => { - # profile => 600, - # parameter => 3, - # }, - # }, - # domain_name7 => { - # new => 'ProfileParameter', - # using => { - # profile => 700, - # parameter => 3, - # }, - # }, rascal_properties1 => { new => 'ProfileParameter', using => { http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a6b451b3/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm b/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm index 310c914..20788c8 100644 --- a/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm +++ b/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForDomainList.pm @@ -101,7 +101,7 @@ __PACKAGE__->add_columns( "protocol", { data_type => "tinyint", is_nullable => 0, size => 4 }, "range_request_handling", { data_type => "tinyint", is_nullable => 0, size => 4 }, "origin_shield", { data_type => "varchar", is_nullable => 0, size => 1024 }, - "profile", { data_type => "integer", is_nullable => 1}, + "profile", { data_type => "integer", is_nullable => 1}, ); 1; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a6b451b3/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 f319757..42604c1 100644 --- a/traffic_ops/app/lib/UI/DeliveryService.pm +++ b/traffic_ops/app/lib/UI/DeliveryService.pm @@ -734,9 +734,9 @@ sub update { my $referer = $self->req->headers->header('referer'); return $self->redirect_to($referer); } - foreach my $f ($self->param) { - print $f . " => " . $self->param($f) . "\n"; - } +# foreach my $f ($self->param) { +# print $f . " => " . $self->param($f) . "\n"; +# } if ( $self->check_deliveryservice_input( $self->param('ds.cdn_id'), $id ) ) { @@ -799,7 +799,7 @@ sub update { $hash{http_bypass_fqdn} = $self->param('ds.http_bypass_fqdn'); } - print Dumper( \%hash ); + #print Dumper( \%hash ); my $update = $self->db->resultset('Deliveryservice')->find( { id => $id } ); $update->update( \%hash ); $update->update(); @@ -958,7 +958,7 @@ sub create { } if ( $self->check_deliveryservice_input($cdn_id) ) { - print "CDN:$cdn_id\n"; + #print "CDN:$cdn_id\n"; my $insert = $self->db->resultset('Deliveryservice')->create( { xml_id => $self->paramAsScalar('ds.xml_id'),
