Merge pull request #26 from jovic1987/master

Add incremental Tasker delay when retrying tasks

Author: ppavlovic

src/Tasker2/RetryAfterResolver.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace G4\Tasker\Tasker2;
+
+class RetryAfterResolver
+{
+    const RETRY_AFTER_60 = 60;
+    const RETRY_AFTER_300 = 300;
+    const RETRY_AFTER_1000 = 1000;
+
+    /**
+     * @var int
+     */
+    private $startedCount;
+
+    /**
+     * RetryAfterResolver constructor.
+     * @param int $startedCount
+     */
+    public function __construct($startedCount)
+    {
+        $this->startedCount = (int) $startedCount;
+    }
+
+    /**
+     * Return after how much seconds task should be retried based on number of starting
+     *
+     * @return int
+     */
+    public function resolve()
+    {
+        if ($this->startedCount === 2) {
+            return self::RETRY_AFTER_300;
+        }
+
+        if ($this->startedCount === 3) {
+            return self::RETRY_AFTER_1000;
+        }
+
+        return self::RETRY_AFTER_60;
+    }
+}

src/Tasker2/Runner.php

@@ -77,8 +77,7 @@ public function execute()
         $this->taskDomain
             ->setStatusWorking()
             ->setIdentifier(gethostname())
-            ->setTsStarted(time())
-            ->setStartedCount($this->taskDomain->getStartedCount() + 1);
+            ->setTsStarted(time());
 
         $this->logTaskStart();
         $this->logNewRelicStart();
@@ -92,6 +91,9 @@ public function execute()
 
         try {
             $this->checkMaxRetryAttempts();
+
+            $this->taskDomain->setStartedCount($this->taskDomain->getStartedCount() + 1);
+
             $task->execute();
             $this->logNewRelicEnd();
         } catch (\Exception $e) {
@@ -247,7 +249,7 @@ private function requeueTask()
         $this->taskDomain
             ->setTsStarted(0)
             ->setExecTime(-1)
-            ->setTsCreated(time() + self::RETRY_AFTER)
+            ->setTsCreated(time() + (new RetryAfterResolver($this->taskDomain->getStartedCount()))->resolve())
             ->setTaskId(null)
             ->setStatus(\G4\Tasker\Consts::STATUS_PENDING);
         $this->taskRepository->add($this->taskDomain);

tests/unit/src/Tasker2/RetryAfterResolverTest.php

@@ -0,0 +1,24 @@
+<?php
+
+
+class RetryAfterResolverTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider resolverDataProvider
+     */
+    public function testResolve($startedCount, $retryAfter)
+    {
+        $resolver = new \G4\Tasker\Tasker2\RetryAfterResolver($startedCount);
+
+        $this->assertSame($retryAfter, $resolver->resolve());
+    }
+
+    public function resolverDataProvider()
+    {
+        return [
+            [1, 60],
+            [2, 300],
+            [3, 1000]
+        ];
+    }
+}