update flow

Author: andriykhc

config/rabbitmq.php

@@ -9,32 +9,25 @@
 
     'driver' => 'rabbitmq',
     'queue' => env('RABBITMQ_QUEUE', 'default'),
-    'connection' => PhpAmqpLib\Connection\AMQPLazyConnection::create_connection([
+    'connection' => PhpAmqpLib\Connection\AMQPLazyConnection::class,
+
+    'hosts' => [
         [
             'host' => env('RABBITMQ_HOST', '127.0.0.1'),
             'port' => env('RABBITMQ_PORT', 5672),
             'user' => env('RABBITMQ_USER', 'guest'),
             'password' => env('RABBITMQ_PASSWORD', 'guest'),
             'vhost' => env('RABBITMQ_VHOST', '/'),
-        ]
-    ], [
-        // 'ssl_options' => [
-        //     'cafile' => env('RABBITMQ_SSL_CAFILE', null),
-        //     'local_cert' => env('RABBITMQ_SSL_LOCALCERT', null),
-        //     'local_key' => env('RABBITMQ_SSL_LOCALKEY', null),
-        //     'verify_peer' => env('RABBITMQ_SSL_VERIFY_PEER', true),
-        //     'passphrase' => env('RABBITMQ_SSL_PASSPHRASE', null),
-        // ],
-        'heartbeat' => 0
-    ]),
+        ],
+    ],
 
     'options' => [
         'queue' => [
             'job' => Botika\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob::class,
         ],
     ],
 
-    /*
+    /**
      * Set to "horizon" if you wish to use Laravel Horizon.
      */
     'worker' => env('RABBITMQ_WORKER', 'default'),

src/LaravelQueueRabbitMQServiceProvider.php

@@ -7,6 +7,7 @@
 use Illuminate\Support\ServiceProvider;
 use Botika\LaravelQueueRabbitMQ\Console\ConsumeCommand;
 use Botika\LaravelQueueRabbitMQ\Queue\Connectors\RabbitMQConnector;
+use PhpAmqpLib\Connection\AMQPStreamConnection;
 
 class LaravelQueueRabbitMQServiceProvider extends ServiceProvider
 {
@@ -69,7 +70,11 @@ public function boot(): void
         $queue = $this->app['queue'];
 
         $queue->addConnector('rabbitmq', function () {
-            return new RabbitMQConnector($this->app['events']);
+            /** @var \PhpAmqpLib\Connection\AbstractConnection $connection */
+            $connection = config('queue.connections.rabbitmq.connection', \PhpAmqpLib\Connection\AMQPLazyConnection::class)::create_connection(
+                config('queue.connections.rabbitmq.hosts', [])
+            );
+            return new RabbitMQConnector($this->app['events'], $connection);
         });
     }
 }

src/Queue/Connectors/RabbitMQConnector.php

@@ -23,9 +23,18 @@ class RabbitMQConnector implements ConnectorInterface
      */
     private $dispatcher;
 
-    public function __construct(Dispatcher $dispatcher)
+    private $connection;
+
+    /**
+     * Constructor
+     *
+     * @param Dispatcher $dispatcher
+     * @param AbstractConnection $connection
+     */
+    public function __construct(Dispatcher $dispatcher, AbstractConnection $connection)
     {
         $this->dispatcher = $dispatcher;
+        $this->connection = $connection;
     }
 
     /**
@@ -40,7 +49,7 @@ public function connect(array $config): Queue
     {
         $queue = $this->createQueue(
             Arr::get($config, 'worker', 'default'),
-            Arr::get($config, 'connection'),
+            $this->connection,
             $config['queue'],
             Arr::get($config, 'after_commit', false),
             Arr::get($config, 'options.queue', [])