idanoo/php-resque
1
0
Fork 0
mirror of https://github.com/idanoo/php-resque.git synced 2024-11-22 16:25:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pedroarnal-master/master'

Browse Source 
Conflicts:
	lib/Resque.php
This commit is contained in:
Chris Boulton 2012-03-05 19:41:09 +11:00
commit 0ad5903a85
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Resque.php
View File

@ -79,7 +79,13 @@ class Resque
self::$redis = new Resque_RedisCluster($server); self::$redis = new Resque_RedisCluster($server);
} }
else { else {
if (strpos($server, 'unix:') === false) {
list($host, $port) = explode(':', $server); list($host, $port) = explode(':', $server);
}
else {
$host = $server;
$port = null;
}
require_once dirname(__FILE__) . '/Resque/Redis.php'; require_once dirname(__FILE__) . '/Resque/Redis.php';
self::$redis = new Resque_Redis($host, $port); self::$redis = new Resque_Redis($host, $port);
} }

2
lib/Resque/Redis.php
View File

@ -39,7 +39,7 @@ class Resque_Redis extends Redisent
'setnx', 'setnx',
'incr', 'incr',
'incrby', 'incrby',
'decrby', 'decr',
'decrby', 'decrby',
'rpush', 'rpush',
'lpush', 'lpush',