-
Notifications
You must be signed in to change notification settings - Fork 9.4k
Changes cache hosts warning / critical levels and continue on multiple hosts #18852
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.
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
Merged
magento-engcom-team
merged 9 commits into
magento:2.3-develop
from
wiardvanrij:varnishpurge
Feb 15, 2019
Merged
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
a8f662e
Changes log info on varnish purges
wiardvanrij 04aa94e
Add docblock
wiardvanrij 0ab520a
Changes logger logic
wiardvanrij fb5a9d1
fixes style
wiardvanrij 7f2c079
Fixes return statement
wiardvanrij d74640a
Fixes cosmetic
wiardvanrij 9a5bc5f
Removed unnecessary blank line
sivaschenko de6af27
Fixed function calls formatting
sivaschenko e95de00
ENGCOM-3470: Static test fix.
p-bystritsky File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -118,6 +118,7 @@ private function splitTags($tagsPattern) | |
private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedTagsChunk) | ||
{ | ||
$headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $formattedTagsChunk]; | ||
$unresponsiveServerError = []; | ||
foreach ($servers as $server) { | ||
$headers['Host'] = $server->getHost(); | ||
try { | ||
|
@@ -131,10 +132,25 @@ private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedT | |
$socketAdapter->read(); | ||
$socketAdapter->close(); | ||
} catch (\Exception $e) { | ||
$this->logger->critical($e->getMessage(), compact('server', 'formattedTagsChunk')); | ||
return false; | ||
$unresponsiveServerError[] = "Cache host: " . $server->getHost() . ":" . $server->getPort() . | ||
"resulted in error message: " . $e->getMessage(); | ||
continue; | ||
} | ||
} | ||
|
||
if($errorCount = count($unresponsiveServerError) > 0) { | ||
wiardvanrij marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
$loggerMessage = implode(" ",$unresponsiveServerError); | ||
|
||
if($errorCount == count($servers)) { | ||
$this->logger->critical('No cache server(s) could be purged ' . $loggerMessage, compact('server', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Each parameter should be in line by itself in multiline function call, example:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sorry I think I misunderstood you :) It is changed now |
||
'formattedTagsChunk')); | ||
} else { | ||
$this->logger->warning('Unresponsive cache server(s) hit' . $loggerMessage, compact('server', | ||
'formattedTagsChunk')); | ||
} | ||
} | ||
|
||
$this->logger->execute(compact('servers', 'formattedTagsChunk')); | ||
return true; | ||
} | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.