Repository: incubator-trafficcontrol Updated Branches: refs/heads/2.0.x 8d9c05462 -> 13ba16d6e
default regex is required on a ds before dnssec keys can be created (if required) (cherry picked from commit c3ad83792530159cef0daf0310c768a47e680888) # Conflicts: # traffic_ops/app/lib/API/Deliveryservice.pm Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e4337c05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e4337c05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e4337c05 Branch: refs/heads/2.0.x Commit: e4337c05f94645e7d8eb016f1694522723721b97 Parents: 8d9c054 Author: Jeremy Mitchell <[email protected]> Authored: Wed Apr 12 20:45:42 2017 -0600 Committer: Jeremy Mitchell <[email protected]> Committed: Thu Apr 13 16:10:21 2017 -0600 ---------------------------------------------------------------------- traffic_ops/app/lib/API/Deliveryservice.pm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e4337c05/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 4717661..7e99dd1 100644 --- a/traffic_ops/app/lib/API/Deliveryservice.pm +++ b/traffic_ops/app/lib/API/Deliveryservice.pm @@ -446,22 +446,26 @@ sub create { my $insert = $self->db->resultset('Deliveryservice')->create($values)->insert(); if ($insert) { + + &log( $self, "Created delivery service [ '" . $insert->xml_id . "' ] with id: " . $insert->id, "APICHANGE" ); + # create location parameters for header_rewrite*, regex_remap* and cacheurl* config files if necessary &UI::DeliveryService::header_rewrite( $self, $insert->id, $params->{profileId}, $params->{xmlId}, $params->{edgeHeaderRewrite}, "edge" ); &UI::DeliveryService::header_rewrite( $self, $insert->id, $params->{profileId}, $params->{xmlId}, $params->{midHeaderRewrite}, "mid" ); &UI::DeliveryService::regex_remap( $self, $insert->id, $params->{profileId}, $params->{xmlId}, $params->{regexRemap} ); &UI::DeliveryService::cacheurl( $self, $insert->id, $params->{profileId}, $params->{xmlId}, $params->{cacheurl} ); + # create a default deliveryservice_regex in the format .*\.xml-id\..* + $self->create_default_ds_regex( $insert->id, '.*\.' . $insert->xml_id . '\..*' ); + # create dnssec keys if necessary my $cdn = $self->db->resultset('Cdn')->search( { id => $params->{cdnId} } )->single(); my $dnssec_enabled = $cdn->dnssec_enabled; if ( $dnssec_enabled ) { &UI::DeliveryService::create_dnssec_keys( $self, $cdn->name, $params->{xmlId}, $insert->id ); + &log( $self, "Created delivery service dnssec keys for [ '" . $insert->xml_id . "' ]", "APICHANGE" ); } - # create a default deliveryservice_regex in the format .*\.xml-id\..* - $self->create_default_ds_regex($insert->id, '.*\.' . $insert->xml_id . '\..*'); - my @response; push( @response, { @@ -521,8 +525,6 @@ sub create { } ); - &log( $self, "Created deliveryservice [ '" . $insert->xml_id . "' ] with id: " . $insert->id, "APICHANGE" ); - return $self->success( \@response, "Deliveryservice creation was successful." ); } else { @@ -1056,7 +1058,7 @@ sub create_default_ds_regex { if ($rs_regex) { # now insert the regex into the deliveryservice_regex table with set number = 0 $self->db->resultset('DeliveryserviceRegex')->create( { deliveryservice => $ds_id, regex => $rs_regex->id, set_number => 0 } )->insert(); - &log( $self, "Default regex created [ " . $rs_regex->pattern . " ] for deliveryservice: " . $ds_id, "APICHANGE" ); + &log( $self, "Created delivery service regex at position 0 [ " . $rs_regex->pattern . " ] for deliveryservice: " . $ds_id, "APICHANGE" ); } }
