Skip to content

Commit a8f662e

Browse files
committed
Changes log info on varnish purges
1 parent eb27ac2 commit a8f662e

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

app/code/Magento/CacheInvalidate/Model/PurgeCache.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ private function splitTags($tagsPattern)
118118
private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedTagsChunk)
119119
{
120120
$headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $formattedTagsChunk];
121+
$unresponsiveServerCount = 0;
121122
foreach ($servers as $server) {
122123
$headers['Host'] = $server->getHost();
123124
try {
@@ -131,10 +132,19 @@ private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedT
131132
$socketAdapter->read();
132133
$socketAdapter->close();
133134
} catch (\Exception $e) {
134-
$this->logger->critical($e->getMessage(), compact('server', 'formattedTagsChunk'));
135-
return false;
135+
$unresponsiveServerCount++;
136+
if ($unresponsiveServerCount == count($servers)) {
137+
$this->logger->critical('Available cache server(s) are unresponsive: ' . $e->getMessage(), compact('server',
138+
'formattedTagsChunk'));
139+
return false;
140+
} else {
141+
$this->logger->warning('Unresponsive cache server hit, yet more cache servers are available: ' .
142+
$e->getMessage(), compact('server', 'formattedTagsChunk'));
143+
continue;
144+
}
136145
}
137146
}
147+
138148
$this->logger->execute(compact('servers', 'formattedTagsChunk'));
139149
return true;
140150
}

lib/internal/Magento/Framework/Cache/InvalidateLogger.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,10 @@ public function critical($message, $params)
6565
{
6666
$this->logger->critical($message, $this->makeParams($params));
6767
}
68+
69+
public function warning($message, $params)
70+
{
71+
$this->logger->warning($message, $this->makeParams($params));
72+
}
73+
6874
}

0 commit comments

Comments
 (0)