Add initial draft of handling failed jobs

Author: marickvantuil

src/CloudTasksJob.php

@@ -10,11 +10,11 @@ class CloudTasksJob extends LaravelJob implements JobContract
 {
     private $job;
     private $attempts;
+    private $maxTries;
 
-    public function __construct($job, $attempts)
+    public function __construct($job)
     {
         $this->job = $job;
-        $this->attempts = $attempts;
         $this->container = Container::getInstance();
     }
 
@@ -32,4 +32,24 @@ public function attempts()
     {
         return $this->attempts;
     }
+
+    public function setAttempts($attempts)
+    {
+        $this->attempts = $attempts;
+    }
+
+    public function setMaxTries($maxTries)
+    {
+        $this->maxTries = $maxTries;
+    }
+
+    public function maxTries()
+    {
+        return $this->maxTries;
+    }
+
+    public function setQueue($queue)
+    {
+        $this->queue = $queue;
+    }
 }

src/CloudTasksQueue.php

@@ -60,6 +60,10 @@ protected function pushToCloudTasks($queue, $payload, $delay = 0, $attempts = 0)
         $httpRequest->setHttpMethod(HttpMethod::POST);
         $httpRequest->setBody($payload);
 
+        $httpRequest->setHeaders([
+            'X-Stackkit-Max-Attempts' => $this->getMaxAttempts($queueName),
+        ]);
+
         $task = $this->createTask();
         $task->setHttpRequest($httpRequest);
 
@@ -99,4 +103,9 @@ private function createTask()
     {
         return app(Task::class);
     }
+
+    private function getMaxAttempts($queue)
+    {
+        return $this->client->getQueue($queue)->getRetryConfig()->getMaxAttempts();
+    }
 }

src/TaskHandler.php

@@ -4,6 +4,7 @@
 
 use Google\Cloud\Tasks\V2\CloudTasksClient;
 use Illuminate\Http\Request;
+use Illuminate\Queue\Events\JobFailed;
 use Illuminate\Queue\Worker;
 use Illuminate\Queue\WorkerOptions;
 use Firebase\JWT\JWT;
@@ -33,6 +34,8 @@ public function handle($task = null)
 
         $task = $task ?: $this->captureTask();
 
+        $this->listenForEvents();
+
         $this->handleTask($task);
     }
 
@@ -81,7 +84,11 @@ private function captureTask()
     {
         $input = file_get_contents('php://input');
 
-        if ($input === false) {
+        if (!$input) {
+            $input = request('input') ?: false;
+        }
+
+        if (!$input) {
             throw new CloudTasksException('Could not read incoming task');
         }
 
@@ -94,13 +101,27 @@ private function captureTask()
         return $task;
     }
 
+    private function listenForEvents()
+    {
+        app('events')->listen(JobFailed::class, function ($event) {
+            app('queue.failer')->log(
+                'cloudtasks', $event->job->getQueue(),
+                $event->job->getRawBody(), $event->exception
+            );
+        });
+    }
+
     /**
      * @param $task
      * @throws CloudTasksException
      */
     private function handleTask($task)
     {
-        $job = new CloudTasksJob($task, request()->header('X-CloudTasks-TaskRetryCount'));
+        $job = new CloudTasksJob($task);
+
+        $job->setAttempts(request()->header('X-CloudTasks-TaskRetryCount') + 1);
+        $job->setQueue(request()->header('X-Cloudtasks-Queuename'));
+        $job->setMaxTries(request()->header('X-Stackkit-Max-Attempts'));
 
         $worker = $this->getQueueWorker();
 

tests/Support/FailingJob.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Tests\Support;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Mail;
+
+class FailingJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        throw new \Error('simulating a failing job');
+    }
+}

tests/Support/failing-job-payload.json

@@ -0,0 +1 @@
+{"uuid":"f4e1ea03-3ab9-45f8-a4a1-50218169472e","displayName":"Tests\\Support\\FailingJob","job":"Illuminate\\Queue\\CallQueuedHandler@call","maxTries":null,"maxExceptions":null,"delay":null,"timeout":null,"timeoutAt":null,"data":{"commandName":"Tests\\Support\\FailingJob","command":"O:24:\"Tests\\Support\\FailingJob\":8:{s:3:\"job\";N;s:10:\"connection\";N;s:5:\"queue\";N;s:15:\"chainConnection\";N;s:10:\"chainQueue\";N;s:5:\"delay\";N;s:10:\"middleware\";a:0:{}s:7:\"chained\";a:0:{}}"}}