idanoo/laravel-resque
1
0
Fork 0
mirror of https://github.com/idanoo/laravel-resque.git synced 2024-11-23 08:55:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/0.2.4'

Browse Source
This commit is contained in:
Holger Reinhardt 2016-08-03 16:25:03 +02:00
commit c4ce7273b0
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/resque.php
View File

@ -2,6 +2,15 @@
return [ return [
/*
|--------------------------------------------------------------------------
| Default Redis Config
|--------------------------------------------------------------------------
|
*/
'default' => env('RESQUE_REDIS', 'resque'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Prefix | Prefix
@ -9,6 +18,6 @@ return [
| |
*/ */
'prefix' => env('RESQUE_PREFIX', 'resque'), 'prefix' => 'lethe_' . env('APP_ID'),
]; ];

6
src/ResqueServiceProvider.php
View File

@ -48,7 +48,11 @@ class ResqueServiceProvider extends ServiceProvider
protected function setRedisConfig() protected function setRedisConfig()
{ {
$config = $this->app['config']['database.redis.default']; $default = $this->app['config']['resque.default'];
$config = $this->app['config'][sprintf('database.redis.%s', $default)];
if (!$config) {
$config = $this->app['config']['database.redis.default'];
}
$host = isset($config['host']) ? $config['host'] : 'localhost'; $host = isset($config['host']) ? $config['host'] : 'localhost';
$port = isset($config['port']) ? $config['port'] : 6379; $port = isset($config['port']) ? $config['port'] : 6379;