Merge pull request #13 from patchlevel/1.1.x-merge-up-into-1.2.x_pyvq…

…PfFG

Merge release 1.1.1 into 1.2.x

src/DefaultWorker.php

@@ -19,6 +19,7 @@
 
 use function max;
 use function microtime;
+use function round;
 use function usleep;
 
 final class DefaultWorker implements Worker
@@ -32,6 +33,7 @@ public function __construct(
     ) {
     }
 
+    /** @param int $sleepTimer in milliseconds */
     public function run(int $sleepTimer = 1000): void
     {
         $this->logger?->debug('Worker starting');
@@ -41,11 +43,12 @@ public function run(int $sleepTimer = 1000): void
         while (!$this->shouldStop) {
             $this->logger?->debug('Worker starting job run');
 
-            $startTime = microtime(true);
+            $startTime = (int)round(microtime(true) * 1000);
 
             ($this->job)();
 
-            $ranTime = (int)(microtime(true) - $startTime);
+            $endTime = (int)round(microtime(true) * 1000);
+            $ranTime = $endTime - $startTime;
 
             $this->logger?->debug('Worker finished job run ({ranTime}ms)', ['ranTime' => $ranTime]);
 

src/Listener/StopWorkerOnTimeLimitListener.php

@@ -9,34 +9,34 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-use function microtime;
+use function time;
 
 final class StopWorkerOnTimeLimitListener implements EventSubscriberInterface
 {
     private float $endTime = 0;
 
-    /** @param positive-int $timeLimitInSeconds */
+    /** @param positive-int $timeLimit in seconds */
     public function __construct(
-        private readonly int $timeLimitInSeconds,
+        private readonly int $timeLimit,
         private readonly LoggerInterface|null $logger = null,
     ) {
     }
 
     public function onWorkerStarted(): void
     {
-        $this->endTime = microtime(true) + $this->timeLimitInSeconds;
+        $this->endTime = time() + $this->timeLimit;
     }
 
     public function onWorkerRunning(WorkerRunningEvent $event): void
     {
-        if ($this->endTime >= microtime(true)) {
+        if ($this->endTime >= time()) {
             return;
         }
 
         $event->worker->stop();
         $this->logger?->info(
             'Worker stopped due to time limit of {timeLimit}s exceeded',
-            ['timeLimit' => $this->timeLimitInSeconds],
+            ['timeLimit' => $this->timeLimit],
         );
     }
 

tests/Unit/Listener/StopWorkerOnTimeLimitListenerTest.php

@@ -36,7 +36,7 @@ public function testShouldStop(): void
         $listener = new StopWorkerOnTimeLimitListener(1);
         $listener->onWorkerStarted();
 
-        sleep(1);
+        sleep(2);
 
         $listener->onWorkerRunning(new WorkerRunningEvent($worker));
     }