Merge pull request #21 from ppavlovic/master

Added ErrorLogger instead of trigger_error

Author: ppavlovic

composer.json

@@ -30,7 +30,7 @@
         "ext-pdo"        : "*",
         "php"            : ">=5.6",
         "g4/cron"        : "*",
-        "g4/log"         : "1.*"
+        "g4/log"         : "1.13.*"
     },
     "suggest": {
         "php-amqplib/php-amqplib": "Use RabbitMQ for task processing"

src/TaskAbstract.php

@@ -3,6 +3,8 @@
 
 abstract class TaskAbstract
 {
+    const RELOCATED = 'RABBITMQ_NOT_AVAILABLE';
+
     private $createdTs;
 
     private $data;
@@ -25,6 +27,12 @@ public function addDelay($value)
         return $this;
     }
 
+    public function relocateToPersistence()
+    {
+        $this->data[self::RELOCATED] = true;
+        return $this;
+    }
+
     /**
      * @return bool
      */

src/Tasker2/Exception/RabbitmqNotAvailableException.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace G4\Tasker\Tasker2\Exception;
+
+class RabbitmqNotAvailableException extends \RuntimeException
+{
+    public function __construct($message = null)
+    {
+        if (!$message) {
+            $message = 'RabbitMQ connection is not available for Tasker Manager';
+        }
+        parent::__construct($message);
+    }
+}

src/Tasker2/Exception/TasksRelocatedToPersistenceException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace G4\Tasker\Tasker2\Exception;
+
+class TasksRelocatedToPersistenceException extends \RuntimeException
+{
+    public function __construct($countTasks)
+    {
+        $message = sprintf(
+            'RabbitMQ connection is not available for Tasker TaskQueue, relocated %d tasks to persistence',
+            $countTasks
+        );
+
+        parent::__construct($message);
+    }
+}

src/Tasker2/Manager.php

@@ -2,6 +2,7 @@
 
 namespace G4\Tasker\Tasker2;
 
+use G4\Tasker\Tasker2\Exception\RabbitmqNotAvailableException;
 use G4\Tasker\Tasker2\Queue\BatchPublisher;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
 
@@ -31,6 +32,11 @@ class Manager
      */
     private $messageOptions;
 
+    /**
+     * @var \G4\Log\ErrorLogger
+     */
+    private $errorLogger;
+
     public function __construct(
         \G4\Tasker\Model\Repository\TaskRepositoryInterface $taskRepository,
         AMQPStreamConnection $rabbitMqConnection = null,
@@ -42,11 +48,17 @@ public function __construct(
         $this->messageOptions = $messageOptions;
     }
 
+    public function setErrorLogger(\G4\Log\ErrorLogger $logger)
+    {
+        $this->errorLogger = $logger;
+        return $this;
+    }
+
     public function run()
     {
         if ($this->rabbitMqConnection === null) {
             // no rabbitmq connection is available
-            trigger_error('RabbitMQ connection is not available for Tasker Manager', E_USER_NOTICE);
+            $this->errorLogger !== null && $this->errorLogger->log(new RabbitmqNotAvailableException());
             return;
         }
         $this

src/Tasker2/TaskQueue.php

@@ -3,6 +3,7 @@
 namespace G4\Tasker\Tasker2;
 
 use G4\Tasker\TaskAbstract;
+use G4\Tasker\Tasker2\Exception\TasksRelocatedToPersistenceException;
 use G4\Tasker\Tasker2\Queue\BatchPublisher;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
 use G4\ValueObject\Uuid;
@@ -34,6 +35,11 @@ class TaskQueue
      */
     private $requestUuid;
 
+    /**
+     * @var \G4\Log\ErrorLogger
+     */
+    private $errorLogger;
+
     public function __construct(
         \G4\Tasker\Queue $queue,
         AMQPStreamConnection $AMQPConnection = null,
@@ -48,6 +54,12 @@ public function __construct(
         $this->requestUuid = $requestUuid;
     }
 
+    public function setErrorLogger(\G4\Log\ErrorLogger $logger)
+    {
+        $this->errorLogger = $logger;
+        return $this;
+    }
+
     public function add(\G4\Tasker\TaskAbstract $task)
     {
         $this->tasks[] = clone $task;
@@ -99,8 +111,7 @@ private function saveCurrentTasks($tasks)
 
         if ($this->AMQPConnection === null) {
             // in case that rabbitmq is not available save tasks to database
-            $this->saveDelayedTasks($tasks);
-            trigger_error('RabbitMQ connection is not available for Tasker TaskQueue', E_USER_NOTICE);
+            $this->delayCurrentTasks($tasks);
             return $this;
         }
 
@@ -118,6 +129,18 @@ private function saveCurrentTasks($tasks)
         return $this;
     }
 
+    private function delayCurrentTasks($tasks)
+    {
+        $tasksModified = array_map(function(TaskAbstract $task) {
+            return $task->relocateToPersistence();
+        }, $tasks);
+
+        $this->saveDelayedTasks($tasksModified);
+        $this->errorLogger !== null
+            && $this->errorLogger->log(new TasksRelocatedToPersistenceException(count($tasksModified))
+        );
+    }
+
     private function getRequestUuid()
     {
         return $this->requestUuid !== null