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/06/09 19:57:15 UTC
[1/3] incubator-trafficcontrol git commit: Fix TO parameters
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 99b80315c -> f6a092768
Fix TO parameters
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/22d50b5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/22d50b5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/22d50b5e
Branch: refs/heads/master
Commit: 22d50b5e14ba989b019e518f8881345f7c07a801
Parents: 3c31e0b
Author: Robert Butts <ro...@gmail.com>
Authored: Mon May 8 11:46:38 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Jun 9 13:56:54 2017 -0600
----------------------------------------------------------------------
.../lib/Extensions/TrafficStats/API/CacheStats.pm | 17 +++++++++++------
traffic_ops/app/lib/Utils/Helper.pm | 9 +++++++++
2 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/22d50b5e/traffic_ops/app/lib/Extensions/TrafficStats/API/CacheStats.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Extensions/TrafficStats/API/CacheStats.pm b/traffic_ops/app/lib/Extensions/TrafficStats/API/CacheStats.pm
index a357a24..a331348 100644
--- a/traffic_ops/app/lib/Extensions/TrafficStats/API/CacheStats.pm
+++ b/traffic_ops/app/lib/Extensions/TrafficStats/API/CacheStats.pm
@@ -23,6 +23,7 @@ use Data::Dumper;
use JSON;
my $builder;
use Extensions::TrafficStats::Delegate::CacheStatistics;
+use Utils::Helper;
use Utils::Helper::Extensions;
Utils::Helper::Extensions->use;
use Validate::Tiny ':all';
@@ -138,7 +139,8 @@ sub get_current_bandwidth {
my $rs = $self->db->resultset('Cdn');
while ( my $cdn = $rs->next ) {
my $cdn_name = $cdn->name;
- my $query = "SELECT last(value) FROM \"monthly\".\"bandwidth.cdn.1min\" WHERE cdn = \'$cdn_name\'";
+ my $escaped_cdn_name = Utils::Helper::escape_influxql($cdn_name);
+ my $query = "SELECT last(value) FROM \"monthly\".\"bandwidth.cdn.1min\" WHERE cdn = \'$escaped_cdn_name\'";
my $bandwidth = $self->get_stat("cache_stats", $query);
if ($bandwidth) {
$bw->{$cdn_name} = $bandwidth/1000000;
@@ -156,7 +158,8 @@ sub get_current_connections {
my $rs = $self->db->resultset('Cdn');
while ( my $cdn = $rs->next ) {
my $cdn_name = $cdn->name;
- my $query = "select last(value) from \"monthly\".\"connections.cdn.1min\" where cdn = \'$cdn_name\'";
+ my $escaped_cdn_name = Utils::Helper::escape_influxql($cdn_name);
+ my $query = "select last(value) from \"monthly\".\"connections.cdn.1min\" where cdn = \'$escaped_cdn_name\'";
my $connections = $self->get_stat("cache_stats", $query);
if ($connections) {
$conn->{$cdn_name} = $connections;
@@ -173,7 +176,8 @@ sub get_current_capacity {
my $rs = $self->db->resultset('Cdn');
while ( my $cdn = $rs->next ) {
my $cdn_name = $cdn->name;
- my $query = "select last(value) from \"monthly\".\"maxkbps.cdn.1min\" where cdn = \'$cdn_name\'";
+ my $escaped_cdn_name = Utils::Helper::escape_influxql($cdn_name);
+ my $query = "select last(value) from \"monthly\".\"maxkbps.cdn.1min\" where cdn = \'$escaped_cdn_name\'";
my $capacity = $self->get_stat("cache_stats", $query);
if ($capacity) {
$capacity = $capacity/1000000; #convert to Gbps
@@ -201,14 +205,15 @@ sub daily_summary {
#get max bw
$max->{"cdn"} = $cdn;
$bytes_served->{"cdn"} = $cdn;
- my $max_bw = $self->get_stat($database, "select max(value) from \"daily_maxgbps\" where cdn = \'$cdn\'");
+ my $escaped_cdn = Utils::Helper::escape_influxql($cdn);
+ my $max_bw = $self->get_stat($database, "select max(value) from \"daily_maxgbps\" where cdn = \'$escaped_cdn\'");
$max->{"highest"} = $max_bw;
#get last bw
- my $last_bw = $self->get_stat($database, "select last(value) from \"daily_maxgbps\" where cdn = \'$cdn\'");
+ my $last_bw = $self->get_stat($database, "select last(value) from \"daily_maxgbps\" where cdn = \'$escaped_cdn\'");
$max->{"yesterday"} = $last_bw;
push(@max_gbps, $max);
#get bytesserved
- my $bytesserved = $self->get_stat($database, "select sum(value) from \"daily_bytesserved\" where cdn = \'$cdn\'");
+ my $bytesserved = $self->get_stat($database, "select sum(value) from \"daily_bytesserved\" where cdn = \'$escaped_cdn\'");
$bytes_served->{"bytesServed"} = $bytesserved/1000;
push(@pb_served, $bytes_served);
$total_bytesserved += $bytesserved;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/22d50b5e/traffic_ops/app/lib/Utils/Helper.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Utils/Helper.pm b/traffic_ops/app/lib/Utils/Helper.pm
index a65de6d..3e2fd95 100644
--- a/traffic_ops/app/lib/Utils/Helper.pm
+++ b/traffic_ops/app/lib/Utils/Helper.pm
@@ -36,6 +36,15 @@ sub mojo {
return ( $self->{MOJO} );
}
+sub escape_influxql {
+ my $query = shift;
+ $query=~s#\\#\\\\#g;
+ $query=~s#'#\\'#g;
+ $query=~s#"#\\"#g;
+ $query=~s#\n#\\n#g;
+ return $query
+}
+
sub is_valid_delivery_service {
my $self = shift || confess("Call on an instance of Utils::Helper");
my $id = shift || confess("Please supply a delivery service ID");
[2/3] incubator-trafficcontrol git commit: Fix TO parameters
Posted by da...@apache.org.
Fix TO parameters
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3c31e0bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3c31e0bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3c31e0bb
Branch: refs/heads/master
Commit: 3c31e0bbe2304dda6fa7f0ab20bdfa28af79ec09
Parents: 99b8031
Author: Robert Butts <ro...@gmail.com>
Authored: Mon May 8 11:00:23 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Jun 9 13:56:54 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3c31e0bb/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 5ebc661..9ac3599 100644
--- a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
+++ b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
@@ -521,13 +521,13 @@ sub delivery_service_data_by_profile {
select
id
from server
- where profile = '.$profile_id.'
+ where profile = $1
)
);
';
my $stmt = $dbh->prepare($qry);
- $stmt->execute();
+ $stmt->execute($profile_id);
my $deliveryservice_id;
my $deliveryservice_xml_id;
[3/3] incubator-trafficcontrol git commit: This closes #651.
Posted by da...@apache.org.
This closes #651.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/f6a09276
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/f6a09276
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/f6a09276
Branch: refs/heads/master
Commit: f6a0927688ea4f8f1e1d18ea0aff8031a4c69ca0
Parents: 22d50b5
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Jun 9 13:57:07 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Jun 9 13:57:07 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------