8000 [3.9] Check if failed log storage is disabled in Queue Service Provider by robjbrain · Pull Request #2357 · mongodb/laravel-mongodb · GitHub
[go: up one dir, main page]
Skip to content

[3.9] Check if failed log storage is disabled in Queue Service Provider #2357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 1, 2022
Merged

[3.9] Check if failed log storage is disabled in Queue Service Provider #2357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
19eb13b
Check if failed log storage is disabled in Queue Service Provider
robjbrain Feb 23, 2022
5813e6c
Update MongodbQueueServiceProvider.php
robjbrain Mar 1, 2022
cdf4556
fix: fix config and add correct failed job provider
divine Mar 1, 2022
090510c
fix: add driver configuration to test
divine Mar 1, 2022
30729d4
fix: php-cs-fixer
divine Mar 1, 2022
ae17990
fix: add correct driver config
divine Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8000
41 changes: 32 additions & 9 deletions src/MongodbQueueServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,46 @@

namespace Jenssegers\Mongodb;

use Illuminate\Queue\Failed\NullFailedJobProvider;
use Illuminate\Queue\QueueServiceProvider;
use Jenssegers\Mongodb\Queue\Failed\MongoFailedJobProvider;

class MongodbQueueServiceProvider extends QueueServiceProvider
{
/**
* @inheritdoc
* Register the failed job services.
*
* @return void
*/
protected function registerFailedJobServices()
{
// Add compatible queue failer if mongodb is configured.
if ($this->app['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'));
});
} else {
parent::registerFailedJobServices();
}
$this->app->singleton('queue.failer', fun 10000 ction ($app) {
$config = $app['config']['queue.failed'];

if (array_key_exists('driver', $config) &&
(is_null($config['driver']) || $config['driver'] === 'null')) {
return new NullFailedJobProvider;
}

if (isset($config['driver']) && $config['driver'] === 'mongodb') {
return $this->mongoFailedJobProvider($config);
} elseif (isset($config['driver']) && $config['driver'] === 'dynamodb') {
return $this->dynamoFailedJobProvider($config);
} elseif (isset($config['driver']) && $config['driver'] === 'database-uuids') {
return $this->databaseUuidFailedJobProvider($config);
} elseif (isset($config['table'])) {
return $this->databaseFailedJobProvider($config);
} else {
return new NullFailedJobProvider;
}
});
}

/**
* Create a new MongoDB failed job provider.
*/
protected function mongoFailedJobProvider(array $config): MongoFailedJobProvider
{
return new MongoFailedJobProvider($this->app['db'], $config['database'], $config['table']);
}
}
1 change: 1 addition & 0 deletions tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,6 @@ protected function getEnvironmentSetUp($app)
'expire' => 60,
]);
$app['config']->set('queue.failed.database', 'mongodb2');
$app['config']->set('queue.failed.driver', 'mongodb');
}
}
1 change: 1 addition & 0 deletions tests/config/queue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

'failed' => [
'database' => env('MONGO_DATABASE'),
'driver' => 'mongodb',
'table' => 'failed_jobs',
],

Expand Down
0