From 4f6904cf04c2a450b420070c801a3a7ff14ff474 Mon Sep 17 00:00:00 2001 From: Holger Reinhardt Date: Mon, 1 Aug 2016 09:46:16 +0200 Subject: [PATCH 1/2] Use redis config for connection --- config/resque.php | 15 +-------------- src/ResqueServiceProvider.php | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/config/resque.php b/config/resque.php index 76bd51a..fa1ed30 100644 --- a/config/resque.php +++ b/config/resque.php @@ -4,20 +4,7 @@ return [ /* |-------------------------------------------------------------------------- - | Connection - |-------------------------------------------------------------------------- - | - */ - - 'connection' => [ - 'host' => env('RESQUE_REDIS_HOST', 'localhost'), - 'port' => env('RESQUE_REDIS_PORT', 6379), - 'database' => env('RESQUE_REDIS_DATABASE', 0), - ], - - /* - |-------------------------------------------------------------------------- - | Track Status + | Prefix |-------------------------------------------------------------------------- | */ diff --git a/src/ResqueServiceProvider.php b/src/ResqueServiceProvider.php index 16ae019..fb03d73 100644 --- a/src/ResqueServiceProvider.php +++ b/src/ResqueServiceProvider.php @@ -48,7 +48,7 @@ class ResqueServiceProvider extends ServiceProvider protected function setRedisConfig() { - $config = $this->app['config']['resque.connection']; + $config = $this->app['config']['redis.default']; $host = isset($config['host']) ? $config['host'] : 'localhost'; $port = isset($config['port']) ? $config['port'] : 6379; From fb590948aac0abda7f233919409854607901f5d4 Mon Sep 17 00:00:00 2001 From: Holger Reinhardt Date: Mon, 1 Aug 2016 09:54:54 +0200 Subject: [PATCH 2/2] Use redis database config for connection --- src/ResqueServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ResqueServiceProvider.php b/src/ResqueServiceProvider.php index fb03d73..5629c44 100644 --- a/src/ResqueServiceProvider.php +++ b/src/ResqueServiceProvider.php @@ -48,7 +48,7 @@ class ResqueServiceProvider extends ServiceProvider protected function setRedisConfig() { - $config = $this->app['config']['redis.default']; + $config = $this->app['config']['database.redis.default']; $host = isset($config['host']) ? $config['host'] : 'localhost'; $port = isset($config['port']) ? $config['port'] : 6379;