Merge branch 'release/0.2.0'

This commit is contained in:
Holger Reinhardt 2016-08-01 09:55:41 +02:00
commit 61a27ddb7d
2 changed files with 2 additions and 15 deletions

View File

@ -4,20 +4,7 @@ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Connection | Prefix
|--------------------------------------------------------------------------
|
*/
'connection' => [
'host' => env('RESQUE_REDIS_HOST', 'localhost'),
'port' => env('RESQUE_REDIS_PORT', 6379),
'database' => env('RESQUE_REDIS_DATABASE', 0),
],
/*
|--------------------------------------------------------------------------
| Track Status
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
*/ */

View File

@ -48,7 +48,7 @@ class ResqueServiceProvider extends ServiceProvider
protected function setRedisConfig() protected function setRedisConfig()
{ {
$config = $this->app['config']['resque.connection']; $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;