bug #22787 [MonologBridge] Fix the Monlog ServerLogHandler from Hanging on Windows (ChadSikorra)

fabpot · fabpot · commit 159f3c59d5ae · 2017-05-20T09:30:50.000+02:00
This PR was squashed before being merged into the 3.3 branch (closes #22787). Discussion ---------- [MonologBridge] Fix the Monlog ServerLogHandler from Hanging on Windows | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | - | Fixed tickets | #22712 | License | MIT This resolves the issue discussed in #22712. This works on both Windows and Linux. Specifically it removes the additional hanging that was caused on Windows when attempting to write/close a TCP socket that's not open on the other end in asynchronous mode. Commits ------- be60aa4 [MonologBridge] Fix the Monlog ServerLogHandler from Hanging on Windows
diff --git a/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php b/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php
@@ -54,12 +54,12 @@ public function handle(array $record)
 
             $recordFormatted = $this->formatRecord($record);
 
-            if (!fwrite($this->socket, $recordFormatted)) {
-                fclose($this->socket);
+            if (-1 === stream_socket_sendto($this->socket, $recordFormatted)) {
+                stream_socket_shutdown($this->socket, STREAM_SHUT_RDWR);
 
                 // Let's retry: the persistent connection might just be stale
                 if ($this->socket = $this->createSocket()) {
-                    fwrite($this->socket, $recordFormatted);
+                    stream_socket_sendto($this->socket, $recordFormatted);
                 }
             }
         } finally {

Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,12 @@ public function handle(array $record)`
`54`	`54`
`55`	`55`	`$recordFormatted = $this->formatRecord($record);`
`56`	`56`
`57`		`- if (!fwrite($this->socket, $recordFormatted)) {`
`58`		`- fclose($this->socket);`
	`57`	`+ if (-1 === stream_socket_sendto($this->socket, $recordFormatted)) {`
	`58`	`+ stream_socket_shutdown($this->socket, STREAM_SHUT_RDWR);`
`59`	`59`
`60`	`60`	`// Let's retry: the persistent connection might just be stale`
`61`	`61`	`if ($this->socket = $this->createSocket()) {`
`62`		`- fwrite($this->socket, $recordFormatted);`
	`62`	`+ stream_socket_sendto($this->socket, $recordFormatted);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`} finally {`