Merge pull request #27 from daniellienert/bugfix/fakequeue

BUGFIX: FakeQueue should also use the cached message passing

Author: kdambekalns

Classes/Queue/FakeQueue.php

@@ -12,6 +12,7 @@
  */
 
 use Neos\Flow\Annotations as Flow;
+use Neos\Cache\Frontend\VariableFrontend;
 use Neos\Flow\Core\Booting\Scripts;
 use Neos\Flow\Utility\Algorithms;
 
@@ -38,6 +39,12 @@ class FakeQueue implements QueueInterface
      */
     protected $async = false;
 
+    /**
+     * @Flow\Inject
+     * @var VariableFrontend
+     */
+    protected $messageCache;
+
     /**
      * @param string $name
      * @param array $options
@@ -76,14 +83,14 @@ public function submit($payload, array $options = [])
     {
         $messageId = Algorithms::generateUUID();
         $message = new Message($messageId, $payload);
-        $commandArguments = [$this->name, base64_encode(serialize($message))];
+
+        $messageCacheIdentifier = sha1(serialize($message));
+        $this->messageCache->set($messageCacheIdentifier, serialize($message));
+
         if ($this->async) {
-            if (!method_exists(Scripts::class, 'executeCommandAsync')) {
-                throw new \RuntimeException('The "async" flag is set, but the currently used Flow version doesn\'t support this (Flow 3.3+ is required)', 1469116604);
-            }
-            Scripts::executeCommandAsync('flowpack.jobqueue.common:job:execute', $this->flowSettings, $commandArguments);
+            Scripts::executeCommandAsync('flowpack.jobqueue.common:job:execute', $this->flowSettings, [$this->name, $messageCacheIdentifier]);
         } else {
-            Scripts::executeCommand('flowpack.jobqueue.common:job:execute', $this->flowSettings, true, $commandArguments);
+            Scripts::executeCommand('flowpack.jobqueue.common:job:execute', $this->flowSettings, true, [$this->name, $messageCacheIdentifier]);
         }
         return $messageId;
     }
@@ -149,7 +156,7 @@ public function count()
      */
     public function flush()
     {
-        //
+        // The FakeQueue does not support message flushing
     }
 
 }

Configuration/Objects.yaml

@@ -17,3 +17,13 @@ Flowpack\JobQueue\Common\Command\JobCommandController:
         arguments:
           1:
             value: FlowPackJobQueueCommon_MessageCache
+
+Flowpack\JobQueue\Common\Queue\FakeQueue:
+  properties:
+    messageCache:
+      object:
+        factoryObjectName: Neos\Flow\Cache\CacheManager
+        factoryMethodName: getCache
+        arguments:
+          1:
+            value: FlowPackJobQueueCommon_MessageCache

composer.json

@@ -4,7 +4,8 @@
     "description": "Common functionality for a JobQueue in Flow applications.",
     "license": "MIT",
     "require": {
-        "neos/flow": "~4.0"
+        "neos/flow": "~4.0",
+        "neos/cache": "*"
     },
     "autoload": {
         "psr-4": {
@@ -87,4 +88,4 @@
             "Neos.Flow-20170127183102"
         ]
     }
-}
+}