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

…' into main
Seldaek · Dec 14, 2020 · 1850160 · 1850160
2 parents ff4378d + 38367d3
commit 1850160
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Monolog/Handler/SocketHandler.php b/src/Monolog/Handler/SocketHandler.php
@@ -354,8 +354,9 @@ private function writeToSocket(string $data): void
 
     private function writingIsTimedOut(int $sent): bool
     {
-        $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;