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 2016/12/12 20:29:21 UTC
[15/33] incubator-trafficcontrol git commit: merge psql-rebase branch
merge psql-rebase branch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c81ea212
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c81ea212
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c81ea212
Branch: refs/heads/psql-rebase
Commit: c81ea212fd40ff12506f97fbeeaa80ddcf75ddd3
Parents: 6c25161
Author: Dave Neuman <ne...@apache.org>
Authored: Fri Dec 2 15:21:59 2016 -0700
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Dec 7 09:48:23 2016 -0700
----------------------------------------------------------------------
.../app/lib/API/DeliveryServiceServer.pm | 3 +++
traffic_ops/app/lib/API/Deliveryservice.pm | 24 ++++++++++----------
traffic_ops/app/lib/API/HwInfo.pm | 1 +
3 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c81ea212/traffic_ops/app/lib/API/DeliveryServiceServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/DeliveryServiceServer.pm b/traffic_ops/app/lib/API/DeliveryServiceServer.pm
index 0aec9cd..a142809 100644
--- a/traffic_ops/app/lib/API/DeliveryServiceServer.pm
+++ b/traffic_ops/app/lib/API/DeliveryServiceServer.pm
@@ -40,6 +40,9 @@ sub index {
}
);
}
+ #update to be ints
+ $limit += 0;
+ $page += 0;
$self->success( \@data, undef, $orderby, $limit, $page );
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c81ea212/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 2d1c35f..e62ffb8 100644
--- a/traffic_ops/app/lib/API/Deliveryservice.pm
+++ b/traffic_ops/app/lib/API/Deliveryservice.pm
@@ -295,7 +295,7 @@ sub update {
my @response;
push(
@response, {
- "active" => \$rs->active,
+ "active" => $rs->active,
"cacheurl" => $rs->cacheurl,
"ccrDnsTtl" => $rs->ccr_dns_ttl,
"cdnId" => $rs->cdn->id,
@@ -318,9 +318,9 @@ sub update {
"id" => $rs->id,
"infoUrl" => $rs->info_url,
"initialDispersion" => $rs->initial_dispersion,
- "ipv6RoutingEnabled" => \$rs->ipv6_routing_enabled,
+ "ipv6RoutingEnabled" => $rs->ipv6_routing_enabled,
"lastUpdated" => $rs->last_updated,
- "logsEnabled" => \$rs->logs_enabled,
+ "logsEnabled" => $rs->logs_enabled,
"longDesc" => $rs->long_desc,
"longDesc1" => $rs->long_desc_1,
"longDesc2" => $rs->long_desc_2,
@@ -328,7 +328,7 @@ sub update {
"midHeaderRewrite" => $rs->mid_header_rewrite,
"missLat" => 0.0 + $rs->miss_lat,
"missLong" => 0.0 + $rs->miss_long,
- "multiSiteOrigin" => \$rs->multi_site_origin,
+ "multiSiteOrigin" => $rs->multi_site_origin,
"multiSiteOriginAlgorithm" => $rs->multi_site_origin_algorithm,
"orgServerFqdn" => $rs->org_server_fqdn,
"originShield" => $rs->origin_shield,
@@ -339,9 +339,9 @@ sub update {
"qstringIgnore" => $rs->qstring_ignore,
"rangeRequestHandling" => $rs->range_request_handling,
"regexRemap" => $rs->regex_remap,
- "regionalGeoBlocking" => \$rs->regional_geo_blocking,
+ "regionalGeoBlocking" => $rs->regional_geo_blocking,
"remapText" => $rs->remap_text,
- "signed" => \$rs->signed,
+ "signed" => $rs->signed,
"sslKeyVersion" => $rs->ssl_key_version,
"trRequestHeaders" => $rs->tr_request_headers,
"trResponseHeaders" => $rs->tr_response_headers,
@@ -436,7 +436,7 @@ sub create {
my @response;
push(
@response, {
- "active" => \$rs->active,
+ "active" => $rs->active,
"cacheurl" => $rs->cacheurl,
"ccrDnsTtl" => $rs->ccr_dns_ttl,
"cdnId" => $rs->cdn->id,
@@ -459,9 +459,9 @@ sub create {
"id" => $rs->id,
"infoUrl" => $rs->info_url,
"initialDispersion" => $rs->initial_dispersion,
- "ipv6RoutingEnabled" => \$rs->ipv6_routing_enabled,
+ "ipv6RoutingEnabled" => $rs->ipv6_routing_enabled,
"lastUpdated" => $rs->last_updated,
- "logsEnabled" => \$rs->logs_enabled,
+ "logsEnabled" => $rs->logs_enabled,
"longDesc" => $rs->long_desc,
"longDesc1" => $rs->long_desc_1,
"longDesc2" => $rs->long_desc_2,
@@ -469,7 +469,7 @@ sub create {
"midHeaderRewrite" => $rs->mid_header_rewrite,
"missLat" => $rs->miss_lat,
"missLong" => $rs->miss_long,
- "multiSiteOrigin" => \$rs->multi_site_origin,
+ "multiSiteOrigin" => $rs->multi_site_origin,
"multiSiteOriginAlgorithm" => $rs->multi_site_origin_algorithm,
"orgServerFqdn" => $rs->org_server_fqdn,
"originShield" => $rs->origin_shield,
@@ -480,9 +480,9 @@ sub create {
"qstringIgnore" => $rs->qstring_ignore,
"rangeRequestHandling" => $rs->range_request_handling,
"regexRemap" => $rs->regex_remap,
- "regionalGeoBlocking" => \$rs->regional_geo_blocking,
+ "regionalGeoBlocking" => $rs->regional_geo_blocking,
"remapText" => $rs->remap_text,
- "signed" => \$rs->signed,
+ "signed" => $rs->signed,
"sslKeyVersion" => $rs->ssl_key_version,
"trRequestHeaders" => $rs->tr_request_headers,
"trResponseHeaders" => $rs->tr_response_headers,
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c81ea212/traffic_ops/app/lib/API/HwInfo.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/HwInfo.pm b/traffic_ops/app/lib/API/HwInfo.pm
index 972f76a..15ef143 100644
--- a/traffic_ops/app/lib/API/HwInfo.pm
+++ b/traffic_ops/app/lib/API/HwInfo.pm
@@ -39,6 +39,7 @@ sub index {
}
);
}
+
$limit += 0; #converts to int.
$self->success( \@data, undef, undef, $limit, undef );
}