From a8f662ebe2ed6a190ea34d407a6085678add93f0 Mon Sep 17 00:00:00 2001 From: Wiard van Rij Date: Sat, 27 Oct 2018 03:08:48 +0200 Subject: [PATCH 1/9] Changes log info on varnish purges --- .../Magento/CacheInvalidate/Model/PurgeCache.php | 14 ++++++++++++-- .../Magento/Framework/Cache/InvalidateLogger.php | 6 ++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php index 727e18280d76f..293f82ef67f7d 100644 --- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php +++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php @@ -118,6 +118,7 @@ private function splitTags($tagsPattern) private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedTagsChunk) { $headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $formattedTagsChunk]; + $unresponsiveServerCount = 0; foreach ($servers as $server) { $headers['Host'] = $server->getHost(); try { @@ -131,10 +132,19 @@ private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedT $socketAdapter->read(); $socketAdapter->close(); } catch (\Exception $e) { - $this->logger->critical($e->getMessage(), compact('server', 'formattedTagsChunk')); - return false; + $unresponsiveServerCount++; + if ($unresponsiveServerCount == count($servers)) { + $this->logger->critical('Available cache server(s) are unresponsive: ' . $e->getMessage(), compact('server', + 'formattedTagsChunk')); + return false; + } else { + $this->logger->warning('Unresponsive cache server hit, yet more cache servers are available: ' . + $e->getMessage(), compact('server', 'formattedTagsChunk')); + continue; + } } } + $this->logger->execute(compact('servers', 'formattedTagsChunk')); return true; } diff --git a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php index 10886f911e295..c440d3c03ecc5 100644 --- a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php +++ b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php @@ -65,4 +65,10 @@ public function critical($message, $params) { $this->logger->critical($message, $this->makeParams($params)); } + + public function warning($message, $params) + { + $this->logger->warning($message, $this->makeParams($params)); + } + } From 04aa94e7062eab740d88c814277e08e0458596a1 Mon Sep 17 00:00:00 2001 From: Wiard van Rij Date: Sat, 27 Oct 2018 03:10:31 +0200 Subject: [PATCH 2/9] Add docblock --- lib/internal/Magento/Framework/Cache/InvalidateLogger.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php index c440d3c03ecc5..60817c281880d 100644 --- a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php +++ b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php @@ -66,6 +66,13 @@ public function critical($message, $params) $this->logger->critical($message, $this->makeParams($params)); } + /** + * Log warning + * + * @param string $message + * @param mixed $params + * @return void + */ public function warning($message, $params) { $this->logger->warning($message, $this->makeParams($params)); From 0ab520a162e03e4a45161ced4bcb32eaef12ad89 Mon Sep 17 00:00:00 2001 From: Wiard van Rij Date: Tue, 13 Nov 2018 22:39:36 +0100 Subject: [PATCH 3/9] Changes logger logic --- .../CacheInvalidate/Model/PurgeCache.php | 28 +++++++++++-------- .../Framework/Cache/InvalidateLogger.php | 2 +- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php index 293f82ef67f7d..316afc12e8454 100644 --- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php +++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php @@ -118,7 +118,7 @@ private function splitTags($tagsPattern) private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedTagsChunk) { $headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $formattedTagsChunk]; - $unresponsiveServerCount = 0; + $unresponsiveServerError = []; foreach ($servers as $server) { $headers['Host'] = $server->getHost(); try { @@ -132,16 +132,22 @@ private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedT $socketAdapter->read(); $socketAdapter->close(); } catch (\Exception $e) { - $unresponsiveServerCount++; - if ($unresponsiveServerCount == count($servers)) { - $this->logger->critical('Available cache server(s) are unresponsive: ' . $e->getMessage(), compact('server', - 'formattedTagsChunk')); - return false; - } else { - $this->logger->warning('Unresponsive cache server hit, yet more cache servers are available: ' . - $e->getMessage(), compact('server', 'formattedTagsChunk')); - continue; - } + $unresponsiveServerError[] = "Cache host: " . $server->getHost() . ":" . $server->getPort() . + "resulted in error message: " . $e->getMessage(); + continue; + } + } + + if($errorCount = count($unresponsiveServerError) > 0) { + + $loggerMessage = implode(" ",$unresponsiveServerError); + + if($errorCount == count($servers)) { + $this->logger->critical('No cache server(s) could be purged ' . $loggerMessage, compact('server', + 'formattedTagsChunk')); + } else { + $this->logger->warning('Unresponsive cache server(s) hit' . $loggerMessage, compact('server', + 'formattedTagsChunk')); } } diff --git a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php index 60817c281880d..4895e65694fe4 100644 --- a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php +++ b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php @@ -78,4 +78,4 @@ public function warning($message, $params) $this->logger->warning($message, $this->makeParams($params)); } -} +} \ No newline at end of file From fb5a9d137e77848861b8312db39c23c9bab88f70 Mon Sep 17 00:00:00 2001 From: Wiard van Rij Date: Wed, 14 Nov 2018 13:34:10 +0100 Subject: [PATCH 4/9] fixes style --- app/code/Magento/CacheInvalidate/Model/PurgeCache.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php index 316afc12e8454..f018a399a5f3f 100644 --- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php +++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php @@ -138,11 +138,13 @@ private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedT } } - if($errorCount = count($unresponsiveServerError) > 0) { + $errorCount = count($unresponsiveServerError); - $loggerMessage = implode(" ",$unresponsiveServerError); + if ($errorCount > 0) { - if($errorCount == count($servers)) { + $loggerMessage = implode(" ", $unresponsiveServerError); + + if ($errorCount == count($servers)) { $this->logger->critical('No cache server(s) could be purged ' . $loggerMessage, compact('server', 'formattedTagsChunk')); } else { From 7f2c079e2ebbc604056ef359c4c627b9cd7c776d Mon Sep 17 00:00:00 2001 From: Wiard van Rij Date: Wed, 14 Nov 2018 13:35:43 +0100 Subject: [PATCH 5/9] Fixes return statement --- app/code/Magento/CacheInvalidate/Model/PurgeCache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php index f018a399a5f3f..890f02533dcd1 100644 --- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php +++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php @@ -134,7 +134,6 @@ private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedT } catch (\Exception $e) { $unresponsiveServerError[] = "Cache host: " . $server->getHost() . ":" . $server->getPort() . "resulted in error message: " . $e->getMessage(); - continue; } } @@ -147,6 +146,7 @@ private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedT if ($errorCount == count($servers)) { $this->logger->critical('No cache server(s) could be purged ' . $loggerMessage, compact('server', 'formattedTagsChunk')); + return false; } else { $this->logger->warning('Unresponsive cache server(s) hit' . $loggerMessage, compact('server', 'formattedTagsChunk')); From d74640a3c3e1c68a6e0b232178c347b219e96340 Mon Sep 17 00:00:00 2001 From: Wiard van Rij Date: Wed, 14 Nov 2018 21:36:15 +0100 Subject: [PATCH 6/9] Fixes cosmetic --- app/code/Magento/CacheInvalidate/Model/PurgeCache.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php index 890f02533dcd1..6786c6fa2539a 100644 --- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php +++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php @@ -144,12 +144,12 @@ private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedT $loggerMessage = implode(" ", $unresponsiveServerError); if ($errorCount == count($servers)) { - $this->logger->critical('No cache server(s) could be purged ' . $loggerMessage, compact('server', - 'formattedTagsChunk')); + $this->logger->critical('No cache server(s) could be purged ' . $loggerMessage, + compact('server', 'formattedTagsChunk')); return false; } else { - $this->logger->warning('Unresponsive cache server(s) hit' . $loggerMessage, compact('server', - 'formattedTagsChunk')); + $this->logger->warning('Unresponsive cache server(s) hit' . $loggerMessage, + compact('server', 'formattedTagsChunk')); } } From 9a5bc5ffc8b9119b9d69cad5aa155c6b75c5d9bc Mon Sep 17 00:00:00 2001 From: Sergii Ivashchenko Date: Thu, 15 Nov 2018 14:04:39 +0200 Subject: [PATCH 7/9] Removed unnecessary blank line --- lib/internal/Magento/Framework/Cache/InvalidateLogger.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php index 4895e65694fe4..dd97e88b6344b 100644 --- a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php +++ b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php @@ -77,5 +77,4 @@ public function warning($message, $params) { $this->logger->warning($message, $this->makeParams($params)); } - -} \ No newline at end of file +} From de6af27f23374277478d1903e4e68c1f3dfdc59b Mon Sep 17 00:00:00 2001 From: Sergii Ivashchenko Date: Thu, 15 Nov 2018 14:08:09 +0200 Subject: [PATCH 8/9] Fixed function calls formatting --- .../Magento/CacheInvalidate/Model/PurgeCache.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php index 6786c6fa2539a..e236b5fb3908f 100644 --- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php +++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php @@ -144,13 +144,17 @@ private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedT $loggerMessage = implode(" ", $unresponsiveServerError); if ($errorCount == count($servers)) { - $this->logger->critical('No cache server(s) could be purged ' . $loggerMessage, - compact('server', 'formattedTagsChunk')); + $this->logger->critical( + 'No cache server(s) could be purged ' . $loggerMessage, + compact('server', 'formattedTagsChunk') + ); return false; - } else { - $this->logger->warning('Unresponsive cache server(s) hit' . $loggerMessage, - compact('server', 'formattedTagsChunk')); } + + $this->logger->warning( + 'Unresponsive cache server(s) hit' . $loggerMessage, + compact('server', 'formattedTagsChunk') + ); } $this->logger->execute(compact('servers', 'formattedTagsChunk')); From e95de003f7cdee34977f247423d8843a115d9721 Mon Sep 17 00:00:00 2001 From: Pavel Bystritsky Date: Mon, 4 Feb 2019 15:43:56 +0200 Subject: [PATCH 9/9] ENGCOM-3470: Static test fix. --- app/code/Magento/CacheInvalidate/Model/PurgeCache.php | 3 +-- lib/internal/Magento/Framework/Cache/InvalidateLogger.php | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php index e236b5fb3908f..38f1a31422647 100644 --- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php +++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php @@ -140,7 +140,6 @@ private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedT $errorCount = count($unresponsiveServerError); if ($errorCount > 0) { - $loggerMessage = implode(" ", $unresponsiveServerError); if ($errorCount == count($servers)) { @@ -150,7 +149,7 @@ private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedT ); return false; } - + $this->logger->warning( 'Unresponsive cache server(s) hit' . $loggerMessage, compact('server', 'formattedTagsChunk') diff --git a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php index dd97e88b6344b..08f9930a81b2f 100644 --- a/lib/internal/Magento/Framework/Cache/InvalidateLogger.php +++ b/lib/internal/Magento/Framework/Cache/InvalidateLogger.php @@ -10,6 +10,9 @@ use Magento\Framework\App\Request\Http as HttpRequest; use Psr\Log\LoggerInterface as Logger; +/** + * Invalidate logger cache. + */ class InvalidateLogger { /** @@ -34,6 +37,7 @@ public function __construct(HttpRequest $request, Logger $logger) /** * Logger invalidate cache + * * @param mixed $invalidateInfo * @return void */ @@ -44,6 +48,7 @@ public function execute($invalidateInfo) /** * Make extra data to logger message + * * @param mixed $invalidateInfo * @return array */