From 795238d2dcf43479083c4cb919c4e9ae500ae9a9 Mon Sep 17 00:00:00 2001 From: Joel-Jensen <60270137+Joel-Jensen@users.noreply.github.com> Date: Tue, 26 Mar 2024 16:04:51 +0100 Subject: [PATCH 1/3] $elapsed is always in ms --- src/Commands/StartRoadRunnerCommand.php | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/Commands/StartRoadRunnerCommand.php b/src/Commands/StartRoadRunnerCommand.php index 224025b8f..12f764a21 100644 --- a/src/Commands/StartRoadRunnerCommand.php +++ b/src/Commands/StartRoadRunnerCommand.php @@ -230,7 +230,7 @@ protected function writeServerOutput($server) 'method' => $method, 'url' => $url, 'statusCode' => $statusCode, - 'duration' => $this->calculateElapsedTime($elapsed), + 'duration' => $elapsed, ]); } }); @@ -245,22 +245,6 @@ protected function writeServerOutput($server) }); } - /** - * Calculate the elapsed time for a request. - */ - protected function calculateElapsedTime(string $elapsed): float - { - if (Str::endsWith($elapsed, 'ms')) { - return substr($elapsed, 0, -2); - } - - if (Str::endsWith($elapsed, 'µs')) { - return mb_substr($elapsed, 0, -2) * 0.001; - } - - return (float) $elapsed * 1000; - } - /** * Stop the server. * From 32ea1291ee62da4e415771b38cc5dc8a4dbe6f70 Mon Sep 17 00:00:00 2001 From: Joel-Jensen <60270137+Joel-Jensen@users.noreply.github.com> Date: Tue, 26 Mar 2024 17:18:32 +0100 Subject: [PATCH 2/3] Revert "$elapsed is always in ms" This reverts commit 795238d2dcf43479083c4cb919c4e9ae500ae9a9. --- src/Commands/StartRoadRunnerCommand.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/Commands/StartRoadRunnerCommand.php b/src/Commands/StartRoadRunnerCommand.php index 12f764a21..224025b8f 100644 --- a/src/Commands/StartRoadRunnerCommand.php +++ b/src/Commands/StartRoadRunnerCommand.php @@ -230,7 +230,7 @@ protected function writeServerOutput($server) 'method' => $method, 'url' => $url, 'statusCode' => $statusCode, - 'duration' => $elapsed, + 'duration' => $this->calculateElapsedTime($elapsed), ]); } }); @@ -245,6 +245,22 @@ protected function writeServerOutput($server) }); } + /** + * Calculate the elapsed time for a request. + */ + protected function calculateElapsedTime(string $elapsed): float + { + if (Str::endsWith($elapsed, 'ms')) { + return substr($elapsed, 0, -2); + } + + if (Str::endsWith($elapsed, 'µs')) { + return mb_substr($elapsed, 0, -2) * 0.001; + } + + return (float) $elapsed * 1000; + } + /** * Stop the server. * From e33e630b4c2ee4cddd2c9e1b4a8a95891117d284 Mon Sep 17 00:00:00 2001 From: Joel-Jensen <60270137+Joel-Jensen@users.noreply.github.com> Date: Wed, 27 Mar 2024 09:37:32 +0100 Subject: [PATCH 3/3] Return elapsed as is if integer --- src/Commands/StartRoadRunnerCommand.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Commands/StartRoadRunnerCommand.php b/src/Commands/StartRoadRunnerCommand.php index 224025b8f..cf12bace6 100644 --- a/src/Commands/StartRoadRunnerCommand.php +++ b/src/Commands/StartRoadRunnerCommand.php @@ -258,6 +258,10 @@ protected function calculateElapsedTime(string $elapsed): float return mb_substr($elapsed, 0, -2) * 0.001; } + if (filter_var($elapsed, FILTER_VALIDATE_INT) !== false) { + return $elapsed; + } + return (float) $elapsed * 1000; }