Avoid collecting duplicate logs if the file cannot be locked

Seldaek · Seldaek · commit 2e97231b969e · 2025-04-03T13:44:45.000+02:00
diff --git a/src/Monolog/Handler/DeduplicationHandler.php b/src/Monolog/Handler/DeduplicationHandler.php
@@ -148,7 +148,9 @@ private function collectLogs(): void
             throw new \RuntimeException('Failed to open file for reading and writing: ' . $this->deduplicationStore);
         }
 
-        flock($handle, LOCK_EX);
+        if (false === flock($handle, LOCK_EX)) {
+            return;
+        }
         $validLogs = [];
 
         $timestampValidity = time() - $this->time;

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,9 @@ private function collectLogs(): void`
`148`	`148`	`throw new \RuntimeException('Failed to open file for reading and writing: ' . $this->deduplicationStore);`
`149`	`149`	`}`
`150`	`150`
`151`		`- flock($handle, LOCK_EX);`
	`151`	`+ if (false === flock($handle, LOCK_EX)) {`
	`152`	`+ return;`
	`153`	`+ }`
`152`	`154`	`$validLogs = [];`
`153`	`155`
`154`	`156`	`$timestampValidity = time() - $this->time;`