From 1106f259c2e7c912c0f4c0098bfbe749e9e0f8b7 Mon Sep 17 00:00:00 2001 From: milos Date: Mon, 30 Nov 2020 17:40:22 +0100 Subject: [PATCH 1/2] add support to define writetimeout in ms --- src/Monolog/Handler/SocketHandler.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Monolog/Handler/SocketHandler.php b/src/Monolog/Handler/SocketHandler.php index 2861e67d7..698360b75 100644 --- a/src/Monolog/Handler/SocketHandler.php +++ b/src/Monolog/Handler/SocketHandler.php @@ -352,10 +352,11 @@ private function writeToSocket(string $data): void } } - private function writingIsTimedOut(int $sent): bool + private function writingIsTimedOut($sent) { - $writingTimeout = (int) floor($this->writingTimeout); - if (0 === $writingTimeout) { + // convert to ms + $writingTimeoutMs = $this->writingTimeout * 1000; + if (0 === $writingTimeoutMs) { return false; } @@ -368,7 +369,10 @@ private function writingIsTimedOut(int $sent): bool usleep(100); } - if ((time() - $this->lastWritingAt) >= $writingTimeout) { + // convert to ms + $lastWritingMs = (time() - $this->lastWritingAt) * 1000; + + if ($lastWritingMs >= $writingTimeoutMs) { $this->closeSocket(); return true; From 38367d3f48e673d311d44bc45a50f11a6f3f7e66 Mon Sep 17 00:00:00 2001 From: milos Date: Mon, 30 Nov 2020 17:42:04 +0100 Subject: [PATCH 2/2] add support to define writetimeout in ms --- src/Monolog/Handler/SocketHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Monolog/Handler/SocketHandler.php b/src/Monolog/Handler/SocketHandler.php index 698360b75..c2a254711 100644 --- a/src/Monolog/Handler/SocketHandler.php +++ b/src/Monolog/Handler/SocketHandler.php @@ -352,7 +352,7 @@ private function writeToSocket(string $data): void } } - private function writingIsTimedOut($sent) + private function writingIsTimedOut(int $sent): bool { // convert to ms $writingTimeoutMs = $this->writingTimeout * 1000;