Refactoring

Author: zhuravljov

src/JobMonitor.php

@@ -82,7 +82,7 @@ public function events()
             Queue::EVENT_AFTER_PUSH => 'afterPush',
             Queue::EVENT_BEFORE_EXEC => 'beforeExec',
             Queue::EVENT_AFTER_EXEC => 'afterExec',
-            Queue::EVENT_AFTER_ERROR => 'afterError',
+            Queue::EVENT_AFTER_ERROR => 'afterExec',
         ];
     }
 
@@ -162,33 +162,6 @@ public function afterExec(ExecEvent $event)
         if (!$this->isActive($event->job)) {
             return;
         }
-
-        $push = static::$startedPush ?: $this->getPushRecord($event);
-        if (!$push) {
-            return;
-        }
-        if ($push->last_exec_id) {
-            ExecRecord::updateAll([
-                'finished_at' => time(),
-                'memory_usage' => memory_get_peak_usage(),
-                'error' => null,
-                'result_data' => serialize($event->result),
-                'retry' => false,
-            ], [
-                'id' => $push->last_exec_id
-            ]);
-        }
-    }
-
-    /**
-     * @param ExecEvent $event
-     */
-    public function afterError(ExecEvent $event)
-    {
-        if (!$this->isActive($event->job)) {
-            return;
-        }
-
         $push = static::$startedPush ?: $this->getPushRecord($event);
         if (!$push) {
             return;
@@ -202,7 +175,7 @@ public function afterError(ExecEvent $event)
                 'finished_at' => time(),
                 'memory_usage' => static::$startedPush ? memory_get_peak_usage() : null,
                 'error' => $event->error,
-                'result_data' => null,
+                'result_data' => $event->result !== null ? serialize($event->result) : null,
                 'retry' => $event->retry,
             ], [
                 'id' => $push->last_exec_id

tests/app/controllers/TestController.php

@@ -5,6 +5,7 @@
 use tests\app\jobs\NotVoidJob;
 use tests\app\jobs\RecursionJob;
 use tests\app\jobs\SimpleJob;
+use tests\app\jobs\WrongJob;
 use Yii;
 use yii\web\Controller;
 use zhuravljov\yii\queue\monitor\base\FlashTrait;
@@ -47,6 +48,12 @@ public function actionPushNotVoidJob()
         return $this->success('Not void job has been pushed.')->goBackward();
     }
 
+    public function actionPushWrongJob()
+    {
+        $this->getQueue()->push(new WrongJob());
+        return $this->success('Wrong job has been pushed.')->goBackward();
+    }
+
     /**
      * @return \yii\queue\Queue
      */

tests/app/jobs/WrongJob.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace tests\app\jobs;
+
+use Exception;
+use yii\queue\JobInterface;
+use yii\queue\RetryableJobInterface;
+
+/**
+ * Wrong Job
+ */
+class WrongJob implements JobInterface, RetryableJobInterface
+{
+    public function execute($queue)
+    {
+        throw new Exception('Test exception.');
+    }
+
+    public function getTtr()
+    {
+        return 10;
+    }
+
+    public function canRetry($attempt, $error)
+    {
+        return $attempt < 2;
+    }
+}

tests/app/views/layouts/test.php

@@ -71,6 +71,11 @@
                         'url' => ['/test/push-not-void-job'],
                         'linkOptions' => ['data-method' => 'post'],
                     ],
+                    [
+                        'label' => 'Push Wrong Job',
+                        'url' => ['/test/push-wrong-job'],
+                        'linkOptions' => ['data-method' => 'post'],
+                    ],
                 ],
             ],
         ],