Merge pull request #1851 from denissonleal/hotfix/multiconnection-queue

fix queued mongodb usage check
mongodb · Oct 18, 2019 · cdc6e1d · cdc6e1d
2 parents 4c75151 + e8b6e75
commit cdc6e1d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/Jenssegers/Mongodb/MongodbQueueServiceProvider.php b/src/Jenssegers/Mongodb/MongodbQueueServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Jenssegers\Mongodb;
 
+use DB;
 use Illuminate\Queue\QueueServiceProvider;
 use Jenssegers\Mongodb\Queue\Failed\MongoFailedJobProvider;
 
@@ -13,7 +14,7 @@ class MongodbQueueServiceProvider extends QueueServiceProvider
     protected function registerFailedJobServices()
     {
         // Add compatible queue failer if mongodb is configured.
-        if (config('queue.failed.database') == 'mongodb') {
+        if (DB::connection(config('queue.failed.database'))->getDriverName() == 'mongodb') {
             $this->app->singleton('queue.failer', function ($app) {
                 return new MongoFailedJobProvider($app['db'], config('queue.failed.database'), config('queue.failed.table'));
             });

diff --git a/tests/QueueTest.php b/tests/QueueTest.php
@@ -1,6 +1,8 @@
 <?php
 declare(strict_types=1);
 
+use Jenssegers\Mongodb\Queue\Failed\MongoFailedJobProvider;
+
 class QueueTest extends TestCase
 {
     public function setUp(): void
@@ -56,6 +58,13 @@ public function testQueueJobExpired(): void
         $this->assertEquals(0, Queue::getDatabase()->table(Config::get('queue.connections.database.table'))->count());
     }
 
+    public function testFailQueueJob(): void
+    {
+        $provider = app('queue.failer');
+
+        $this->assertInstanceOf(MongoFailedJobProvider::class, $provider);
+    }
+
     public function testFindFailJobNull(): void
     {
         Config::set('queue.failed.database', 'mongodb');

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -28,6 +28,7 @@ protected function getPackageProviders($app)
     {
         return [
             Jenssegers\Mongodb\MongodbServiceProvider::class,
+            Jenssegers\Mongodb\MongodbQueueServiceProvider::class,
             Jenssegers\Mongodb\Auth\PasswordResetServiceProvider::class,
             Jenssegers\Mongodb\Validation\ValidationServiceProvider::class,
         ];
@@ -50,6 +51,7 @@ protected function getEnvironmentSetUp($app)
         $app['config']->set('database.default', 'mongodb');
         $app['config']->set('database.connections.mysql', $config['connections']['mysql']);
         $app['config']->set('database.connections.mongodb', $config['connections']['mongodb']);
+        $app['config']->set('database.connections.mongodb2', $config['connections']['mongodb']);
         $app['config']->set('database.connections.dsn_mongodb', $config['connections']['dsn_mongodb']);
 
         $app['config']->set('auth.model', 'User');
@@ -63,5 +65,6 @@ protected function getEnvironmentSetUp($app)
             'queue' => 'default',
             'expire' => 60,
         ]);
+        $app['config']->set('queue.failed.database', 'mongodb2');
     }
 }