Merge pull request vyuldashev#231 from adm-bome/fix-for-horizon-failed-rabbitmq-jobs

Added extra listener when horizon is used as worker.

Author: vyuldashev

src/Horizon/Listeners/RabbitMQFailedEvent.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\Listeners;
+
+use Illuminate\Contracts\Events\Dispatcher;
+use Laravel\Horizon\Events\JobFailed as HorizonJobFailed;
+use Illuminate\Queue\Events\JobFailed as LaravelJobFailed;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
+
+class RabbitMQFailedEvent
+{
+    /**
+     * The event dispatcher implementation.
+     *
+     * @var \Illuminate\Contracts\Events\Dispatcher
+     */
+    public $events;
+
+    /**
+     * Create a new listener instance.
+     *
+     * @param  \Illuminate\Contracts\Events\Dispatcher $events
+     * @return void
+     */
+    public function __construct(Dispatcher $events)
+    {
+        $this->events = $events;
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  \Illuminate\Queue\Events\JobFailed $event
+     * @return void
+     */
+    public function handle(LaravelJobFailed $event)
+    {
+        if (! $event->job instanceof RabbitMQJob) {
+            return;
+        }
+
+        $this->events->dispatch((new HorizonJobFailed(
+            $event->exception, $event->job, $event->job->getRawBody()
+        ))->connection($event->connectionName)->queue($event->job->getQueue()));
+    }
+}

src/Queue/Connectors/RabbitMQConnector.php

@@ -6,6 +6,7 @@
 use Interop\Amqp\AmqpContext;
 use InvalidArgumentException;
 use Illuminate\Contracts\Queue\Queue;
+use Illuminate\Queue\Events\JobFailed;
 use Interop\Amqp\AmqpConnectionFactory;
 use Enqueue\AmqpTools\DelayStrategyAware;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -15,6 +16,7 @@
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 use Interop\Amqp\AmqpConnectionFactory as InteropAmqpConnectionFactory;
 use Enqueue\AmqpLib\AmqpConnectionFactory as EnqueueAmqpConnectionFactory;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\Listeners\RabbitMQFailedEvent;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\RabbitMQQueue as HorizonRabbitMQQueue;
 
 class RabbitMQConnector implements ConnectorInterface
@@ -79,6 +81,8 @@ public function connect(array $config): Queue
         }
 
         if ($worker === 'horizon') {
+            $this->dispatcher->listen(JobFailed::class, RabbitMQFailedEvent::class);
+
             return new HorizonRabbitMQQueue($context, $config);
         }