Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for real time logging (create new response condition) issue #682 #683

Merged
merged 2 commits into from
Jan 8, 2024
Merged

Fix for real time logging (create new response condition) issue #682 #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
658b22e
fix for #682
dpotkoc Jan 4, 2024
07fa0a4
fix for #682
dpotkoc Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions Controller/Adminhtml/FastlyCdn/Logging/CreateEndpoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
class CreateEndpoint extends Action
{
const ADMIN_RESOURCE = 'Magento_Config::config';

/**
* @var Http
*/
Expand Down Expand Up @@ -110,16 +110,16 @@ public function execute()
$clone,
$this->getRequest()->getParam('condition_name'),
$this->getRequest()->getParam('apply_if'),
$this->getRequest()->getParam('condition_priority'),
$this->getRequest()->getParam('response_condition')
$this->getRequest()->getParam('condition_priority')
);

$params = array_merge(
$this->getRequest()->getParam('log_endpoint'),
['response_condition' => $condition]
);
$params = array_filter($params);

$endpoint = $this->api->createLogEndpoint($clone->number, $endpointType, array_filter($params));
$endpoint = $this->api->createLogEndpoint($clone->number, $endpointType, $params);

if (!$endpoint) {
return $result->setData([
Expand Down Expand Up @@ -156,23 +156,21 @@ public function execute()
* @param $conditionName
* @param $applyIf
* @param $conditionPriority
* @param $selCondition
* @return mixed
* @return string|null
* @throws \Magento\Framework\Exception\LocalizedException
*/
private function createCondition($clone, $conditionName, $applyIf, $conditionPriority, $selCondition)
private function createCondition($clone, $conditionName, $applyIf, $conditionPriority)
{
if ($conditionName == $selCondition && !empty($selCondition) &&
!$this->api->getCondition($clone->number, $conditionName)) {
$condition = [
'name' => $conditionName,
'statement' => $applyIf,
'type' => 'RESPONSE',
'priority' => $conditionPriority
];
$createCondition = $this->api->createCondition($clone->number, $condition);
return $createCondition->name;
if (!$conditionName || !$applyIf || !$conditionPriority) {
return null;
}
return $selCondition;
$condition = [
'name' => $conditionName,
'statement' => $applyIf,
'type' => 'RESPONSE',
'priority' => $conditionPriority
];
$createCondition = $this->api->createCondition($clone->number, $condition);
return $createCondition->name;
}
}
29 changes: 13 additions & 16 deletions Controller/Adminhtml/FastlyCdn/Logging/UpdateEndpoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ public function execute()
$clone,
$this->getRequest()->getParam('condition_name'),
$this->getRequest()->getParam('apply_if'),
$this->getRequest()->getParam('condition_priority'),
$this->getRequest()->getParam('response_condition')
$this->getRequest()->getParam('condition_priority')
);

$params = array_merge(
Expand Down Expand Up @@ -162,23 +161,21 @@ public function execute()
* @param $conditionName
* @param $applyIf
* @param $conditionPriority
* @param $selCondition
* @return mixed
* @return string|null
* @throws \Magento\Framework\Exception\LocalizedException
*/
private function createCondition($clone, $conditionName, $applyIf, $conditionPriority, $selCondition)
private function createCondition($clone, $conditionName, $applyIf, $conditionPriority)
{
if ($conditionName == $selCondition && !empty($selCondition) &&
!$this->api->getCondition($clone->number, $conditionName)) {
$condition = [
'name' => $conditionName,
'statement' => $applyIf,
'type' => 'RESPONSE',
'priority' => $conditionPriority
];
$createCondition = $this->api->createCondition($clone->number, $condition);
return $createCondition->name;
if (!$conditionName || !$applyIf || !$conditionPriority) {
return null;
}
return $selCondition;
$condition = [
'name' => $conditionName,
'statement' => $applyIf,
'type' => 'RESPONSE',
'priority' => $conditionPriority
];
$createCondition = $this->api->createCondition($clone->number, $condition);
return $createCondition->name;
}
}