mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-07 13:46:38 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'milos-silni/add-support-ms-writetimeout' into main

Browse Source
This commit is contained in:
Jordi Boggiano
2020-12-14 13:29:15 +01:00
parent ff4378dfbe 38367d3f48
commit 1850160a4f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Monolog/Handler/SocketHandler.php
View File

@@ -354,8 +354,9 @@ class SocketHandler extends AbstractProcessingHandler
private function writingIsTimedOut(int $sent): bool private function writingIsTimedOut(int $sent): bool
{ {
$writingTimeout = (int) floor($this->writingTimeout); // convert to ms
if (0 === $writingTimeout) { $writingTimeoutMs = $this->writingTimeout * 1000;
if (0 === $writingTimeoutMs) {
return false; return false;
} }
@@ -368,7 +369,10 @@ class SocketHandler extends AbstractProcessingHandler
usleep(100); usleep(100);
} }
if ((time() - $this->lastWritingAt) >= $writingTimeout) { // convert to ms
$lastWritingMs = (time() - $this->lastWritingAt) * 1000;
if ($lastWritingMs >= $writingTimeoutMs) {
$this->closeSocket(); $this->closeSocket();
return true; return true;