From 6618a7f612faa3624d06313e110dc4087dec89a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Wed, 2 Dec 2020 19:19:25 +0100 Subject: [PATCH] Fixes issue with the worker defaulting to the illuminate queue manager (#2481) We are instantiating our own queue handling factory which returns the flarum.queue.connection binding no matter what. The queue Worker and other queue related code rely on this manager to get its thing going. Therefor we need to re-use our own factory everywhere, including in the worker. --- framework/core/src/Queue/QueueServiceProvider.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/framework/core/src/Queue/QueueServiceProvider.php b/framework/core/src/Queue/QueueServiceProvider.php index ac9024516..3fd2db794 100644 --- a/framework/core/src/Queue/QueueServiceProvider.php +++ b/framework/core/src/Queue/QueueServiceProvider.php @@ -22,7 +22,6 @@ use Illuminate\Queue\Console as Commands; use Illuminate\Queue\Events\JobFailed; use Illuminate\Queue\Failed\NullFailedJobProvider; use Illuminate\Queue\Listener as QueueListener; -use Illuminate\Queue\QueueManager; use Illuminate\Queue\SyncQueue; use Illuminate\Queue\Worker; @@ -66,7 +65,7 @@ class QueueServiceProvider extends AbstractServiceProvider $config = $app->make(Config::class); return new Worker( - new QueueManager($app), + $app[Factory::class], $app['events'], $app[ExceptionHandling::class], function () use ($config) {