Merge branch 'master' into master

Author: butschster

CHANGELOG.md

@@ -4,18 +4,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
 
-## UNRELEASED
-
 ### Added
 
 - gRPC client support
 
+## Unreleased
+
 ### Fixed
 
+- Check pipeline stats on message push [#147]
+- Edit the $ttl calculation for the RoadRunnerStore, the time calculation takes place inside the spiral/roadrunner-kv package
 - Tasks were stuck in case of an error, the "release" method did not return them to the queue.
 - The "calculateBackoff" method incorrectly took the index "$job->attempts()"
 - The "withHeader" method of the "\Spiral\RoadRunner\Jobs\Task\WritableHeadersInterface" interface expects the type "string|iterable", "int" is passed
 
+[#147]:https://github.com/roadrunner-php/laravel-bridge/issues/147
+
 ## v5.12.0
 
 ### Added

src/Cache/RoadRunnerStore.php

@@ -6,13 +6,10 @@
 
 use Illuminate\Cache\TaggableStore;
 use Illuminate\Contracts\Cache\LockProvider;
-use Illuminate\Support\InteractsWithTime;
 use Spiral\RoadRunner\KeyValue\StorageInterface;
 
 final class RoadRunnerStore extends TaggableStore implements LockProvider
 {
-    use InteractsWithTime;
-
     public function __construct(private StorageInterface $storage, private string $prefix = '') {}
 
     public function get($key)
@@ -39,7 +36,7 @@ public function many(array $keys)
 
     public function put($key, $value, $seconds)
     {
-        return $this->storage->set($this->prefix . $key, $value, $this->calculateExpiration($seconds));
+        return $this->storage->set($this->prefix . $key, $value, $seconds);
     }
 
     public function putMany(array $values, $seconds)
@@ -52,7 +49,7 @@ public function putMany(array $values, $seconds)
 
         return $this->storage->setMultiple(
             $prefixedValues,
-            $this->calculateExpiration($seconds),
+            $seconds,
         );
     }
 
@@ -90,28 +87,4 @@ public function getPrefix()
     {
         return $this->prefix;
     }
-
-    /**
-     * Set the cache key prefix.
-     */
-    public function setPrefix(string $prefix): void
-    {
-        $this->prefix = !empty($prefix) ? $prefix . ':' : '';
-    }
-
-    /**
-     * Get the expiration time of the key.
-     */
-    protected function calculateExpiration(int $seconds): int
-    {
-        return $this->toTimestamp($seconds);
-    }
-
-    /**
-     * Get the UNIX timestamp for the given number of seconds.
-     */
-    protected function toTimestamp(int $seconds): int
-    {
-        return $seconds > 0 ? $this->availableAt($seconds) : 0;
-    }
 }

src/Queue/RoadRunnerQueue.php

@@ -120,7 +120,7 @@ private function getStats(?string $queue = null): Stat
 
         /** @var Stat $stat */
         foreach ($stats as $stat) {
-            if ($stat->getQueue() === $queue) {
+            if ($stat->getPipeline() === $queue) {
                 return $stat;
             }
         }