You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by jv...@apache.org on 2017/02/27 17:16:52 UTC
[09/20] incubator-trafficcontrol git commit: minor fixes
minor fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fccf6642
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fccf6642
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fccf6642
Branch: refs/heads/master
Commit: fccf664242e293ca94e2578ff94852bbf591280b
Parents: f853816
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Thu Jan 19 13:39:20 2017 -0500
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Feb 27 16:57:46 2017 +0000
----------------------------------------------------------------------
traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm | 2 +-
.../lib/Schema/Result/DeliveryServiceInfoForCdnList.pm | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fccf6642/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
index caf1836..d5f4108 100644
--- a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
+++ b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
@@ -152,7 +152,7 @@ sub get_cdn_config {
if ( !&is_oper($self) ) {
return $self->forbidden();
}
- print STDERR "well i'm here anyway.";
+
##check the scope - is this the correct route?
if ( $scope ne 'cdn' ) {
return $self->alert( "Error - incorrect file scope for route used. Please use the " . $scope . " route." );
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fccf6642/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForCdnList.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForCdnList.pm b/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForCdnList.pm
index 8c842e1..8bfcc84 100644
--- a/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForCdnList.pm
+++ b/traffic_ops/app/lib/Schema/Result/DeliveryServiceInfoForCdnList.pm
@@ -69,9 +69,13 @@ FROM
JOIN parameter ON parameter.id = profile_parameter.parameter
JOIN deliveryservice_server ON deliveryservice_server.deliveryservice = deliveryservice.id
JOIN server ON deliveryservice_server.server = server.id
-WHERE deliveryservice.cdn_id = ? AND parameter.name = 'domain_name'
-ORDER BY ds_id, re_type , deliveryservice_regex.set_number
-"
+WHERE
+ deliveryservice.cdn_id = ?
+ AND parameter.name = 'domain_name'
+ORDER BY
+ ds_id,
+ re_type ,
+ deliveryservice_regex.set_number"
);
__PACKAGE__->add_columns(