make delayed queue connfigurable

lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php

@@ -21,7 +21,12 @@ class AdminConfigurationController extends Controller
 {
     public function indexAction(PhraseaApplication $app, Request $request)
     {
-        return $this->render('admin/worker-manager/index.html.twig');
+        /** @var AMQPConnection $serverConnection */
+        $serverConnection = $this->app['alchemy_worker.amqp.connection'];
+
+        return $this->render('admin/worker-manager/index.html.twig', [
+            'isConnected' => ($serverConnection->getChannel() != null) ? true : false
+        ]);
     }
 
     /**
@@ -48,6 +53,7 @@ class AdminConfigurationController extends Controller
             $serverConnection = $this->app['alchemy_worker.amqp.connection'];
             // change the queue TTL
             $serverConnection->reinitializeQueue($retryQueuesToReset);
+            $serverConnection->reinitializeQueue(AMQPConnection::$defaultDelayedQueues);
 
             return $app->redirectPath('worker_admin');
         }

lib/Alchemy/Phrasea/WorkerManager/Form/WorkerConfigurationType.php

@@ -34,6 +34,12 @@ class WorkerConfigurationType extends AbstractType
             ->add(MessagePublisher::POPULATE_INDEX_TYPE, 'text', [
                 'label' => 'Populate Index retry delay in ms'
             ])
+            ->add('delayedSubdef', 'text', [
+                'label' => 'Subdef delay in ms'
+            ])
+            ->add('delayedWriteMeta', 'text', [
+                'label' => 'Write meta delay in ms'
+            ])
         ;
     }
 

lib/Alchemy/Phrasea/WorkerManager/Queue/AMQPConnection.php

@@ -63,6 +63,9 @@ class AMQPConnection
     // default message TTL in retry queue in millisecond
     const RETRY_DELAY =  10000;
 
+    // default message TTL in delayed queue in millisecond
+    const DELAY = 5000;
+
     public function __construct(PropertyAccess $conf)
     {
         $defaultConfiguration = [
@@ -150,7 +153,7 @@ class AMQPConnection
             $this->channel->queue_declare(self::$defaultRetryQueues[$queueName], false, true, false, false, false, new AMQPTable([
                 'x-dead-letter-exchange'    => AMQPConnection::ALCHEMY_EXCHANGE,
                 'x-dead-letter-routing-key' => $queueName,
-                'x-message-ttl'             => $this->getTtlPerRouting($queueName)
+                'x-message-ttl'             => $this->getTtlRetryPerRouting($queueName)
             ]));
 
             $this->channel->queue_bind(self::$defaultRetryQueues[$queueName], AMQPConnection::RETRY_ALCHEMY_EXCHANGE, self::$defaultRetryQueues[$queueName]);
@@ -161,7 +164,7 @@ class AMQPConnection
             $this->channel->queue_declare($queueName, false, true, false, false, false, new AMQPTable([
                 'x-dead-letter-exchange'    => AMQPConnection::ALCHEMY_EXCHANGE,
                 'x-dead-letter-routing-key' => $routing,
-                'x-message-ttl'             => $this->getTtlPerRouting($routing)
+                'x-message-ttl'             => $this->getTtlRetryPerRouting($routing)
             ]));
 
             $this->channel->queue_bind($queueName, AMQPConnection::RETRY_ALCHEMY_EXCHANGE, $queueName);
@@ -176,7 +179,7 @@ class AMQPConnection
             $this->channel->queue_declare($queueName, false, true, false, false, false, new AMQPTable([
                 'x-dead-letter-exchange'    => AMQPConnection::ALCHEMY_EXCHANGE,
                 'x-dead-letter-routing-key' => $routing,
-                'x-message-ttl'             => 5000
+                'x-message-ttl'             => $this->getTtlDelayedPerRouting($routing)
             ]));
 
             $this->channel->queue_bind($queueName, AMQPConnection::RETRY_ALCHEMY_EXCHANGE, $queueName);
@@ -191,6 +194,10 @@ class AMQPConnection
 
     public function reinitializeQueue(array $queuNames)
     {
+        if (!isset($this->channel)) {
+            $this->getChannel();
+            $this->declareExchange();
+        }
         foreach ($queuNames as $queuName) {
             if (in_array($queuName, self::$defaultQueues)) {
                 $this->channel->queue_purge($queuName);
@@ -216,7 +223,7 @@ class AMQPConnection
      * @param $routing
      * @return int
      */
-    private function getTtlPerRouting($routing)
+    private function getTtlRetryPerRouting($routing)
     {
         $config = $this->conf->get(['workers']);
 
@@ -233,4 +240,20 @@ class AMQPConnection
 
         return self::RETRY_DELAY;
     }
+
+    private function getTtlDelayedPerRouting($routing)
+    {
+        $delayed = [
+            MessagePublisher::METADATAS_QUEUE => 'delayedWriteMeta',
+            MessagePublisher::SUBDEF_QUEUE    => 'delayedSubdef'
+        ];
+
+        $config = $this->conf->get(['workers']);
+
+        if (isset($config['retry_queue']) && isset($config['retry_queue'][$delayed[$routing]])) {
+            return (int)$config['retry_queue'][$delayed[$routing]];
+        }
+
+        return self::DELAY;
+    }
 }

lib/Alchemy/Phrasea/WorkerManager/Worker/SubdefCreationWorker.php

@@ -72,9 +72,9 @@ class SubdefCreationWorker implements WorkerInterface
                         'payload'       => $payload
                     ];
                     $this->messagePublisher->publishMessage($payload, MessagePublisher::DELAYED_SUBDEF_QUEUE);
-
+//
-                    $message = MessagePublisher::SUBDEF_CREATION_TYPE.' to be re-published! >> Payload ::'. json_encode($payload);
+//                    $message = MessagePublisher::SUBDEF_CREATION_TYPE.' to be re-published! >> Payload ::'. json_encode($payload);
-                    $this->messagePublisher->pushLog($message);
+//                    $this->messagePublisher->pushLog($message);
 
                     return ;
                 }

lib/Alchemy/Phrasea/WorkerManager/Worker/WriteMetadatasWorker.php

@@ -77,8 +77,8 @@ class WriteMetadatasWorker implements WorkerInterface
                 ];
                 $this->messagePublisher->publishMessage($payload, MessagePublisher::DELAYED_METADATAS_QUEUE);
 
-                $message = MessagePublisher::WRITE_METADATAS_TYPE.' to be re-published! >> Payload ::'. json_encode($payload);
+//                $message = MessagePublisher::WRITE_METADATAS_TYPE.' to be re-published! >> Payload ::'. json_encode($payload);
-                $this->messagePublisher->pushLog($message);
+//                $this->messagePublisher->pushLog($message);
 
                 return ;
             }

templates/web/admin/worker-manager/index.html.twig

@@ -1,5 +1,6 @@
 <h1>Worker</h1>
 
+{% if isConnected %}
     <div>
         <!-- Nav tabs -->
         <ul class="nav nav-tabs" id="configurationTabs">
@@ -75,3 +76,10 @@
             }
         });
     </script>
+{% else %}
+    <h1 class="alert alert-danger">
+        Error! Check rabbit config to use worker.
+    </h1>
+{% endif %}
+
+

templates/web/admin/worker-manager/worker_configuration.html.twig

@@ -1,6 +1,10 @@
 <h3> Config Worker queue retry</h3>
+<p class="alert alert-danger">
+    <strong>Warning!</strong>
+    When applied, it's re-initialize and purge "retry" and "delayed" queue!
+</p>
 
-<p>Set up the delay between two attempts per queue!</p>
+<p>Set up the delay between two attempts per queue! (if not set, default 10000 millisecond)</p>
 {{ form_start(form, {'action': path('worker_admin_configuration')}) }}
 
 <div class="control-group">
@@ -31,8 +35,20 @@
     {{ form_row(form.populateIndex) }}
 </div>
 
+<h3> Config Worker queue delayed</h3>
+<p>if not set ,default 5000 millisecond</p>
+
 <div class="control-group">
-    <input type="submit" class="btn btn-primary" value={{ "Apply retry delay"|trans }} />
+    {{ form_row(form.delayedSubdef) }}
+</div>
+
+<div class="control-group">
+    {{ form_row(form.delayedWriteMeta) }}
+</div>
+
+
+<div class="control-group">
+    <input type="submit" class="btn btn-primary" value={{ "Apply in queue"|trans }} />
 </div>