@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | { |
| 11 | 11 | const VERSION = '1.2'; |
| 12 | 12 | |
| 13 | - const DEFAULT_INTERVAL = 5; |
|
| 13 | + const DEFAULT_INTERVAL = 5; |
|
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | * @var Resque_Redis Instance of Resque_Redis that talks to redis or |
@@ -29,9 +29,9 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | protected static $redisDatabase = 0; |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @var string auth of Redis database |
|
| 34 | - */ |
|
| 32 | + /** |
|
| 33 | + * @var string auth of Redis database |
|
| 34 | + */ |
|
| 35 | 35 | protected static $auth; |
| 36 | 36 | |
| 37 | 37 | /** |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * a nested array of servers with host/port pairs or |
| 45 | 45 | * external Redis connection object. |
| 46 | 46 | * @param int $database |
| 47 | - * @param string $auth |
|
| 47 | + * @param string $auth |
|
| 48 | 48 | */ |
| 49 | 49 | public static function setBackend($server, $database = 0, $auth = null) |
| 50 | 50 | { |
@@ -67,16 +67,16 @@ discard block |
||
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | if (is_object(self::$redisServer)) { |
| 70 | - return self::$redisServer; |
|
| 71 | - } elseif (is_callable(self::$redisServer)) { |
|
| 70 | + return self::$redisServer; |
|
| 71 | + } elseif (is_callable(self::$redisServer)) { |
|
| 72 | 72 | self::$redis = call_user_func(self::$redisServer, self::$redisDatabase); |
| 73 | 73 | } else { |
| 74 | 74 | self::$redis = new Resque_Redis(self::$redisServer, self::$redisDatabase); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | if (!empty(self::$auth)) { |
| 78 | - self::$redis->auth(self::$auth); |
|
| 79 | - } |
|
| 78 | + self::$redis->auth(self::$auth); |
|
| 79 | + } |
|
| 80 | 80 | |
| 81 | 81 | return self::$redis; |
| 82 | 82 | } |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | */ |
| 139 | 139 | public static function pop($queue) |
| 140 | 140 | { |
| 141 | - $item = self::redis()->lpop('queue:' . $queue); |
|
| 141 | + $item = self::redis()->lpop('queue:' . $queue); |
|
| 142 | 142 | |
| 143 | 143 | if(!$item) { |
| 144 | 144 | return; |
@@ -156,11 +156,11 @@ discard block |
||
| 156 | 156 | */ |
| 157 | 157 | public static function dequeue($queue, $items = Array()) |
| 158 | 158 | { |
| 159 | - if(count($items) > 0) { |
|
| 159 | + if(count($items) > 0) { |
|
| 160 | 160 | return self::removeItems($queue, $items); |
| 161 | - } else { |
|
| 161 | + } else { |
|
| 162 | 162 | return self::removeList($queue); |
| 163 | - } |
|
| 163 | + } |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | /** |
@@ -171,9 +171,9 @@ discard block |
||
| 171 | 171 | */ |
| 172 | 172 | public static function removeQueue($queue) |
| 173 | 173 | { |
| 174 | - $num = self::removeList($queue); |
|
| 175 | - self::redis()->srem('queues', $queue); |
|
| 176 | - return $num; |
|
| 174 | + $num = self::removeList($queue); |
|
| 175 | + self::redis()->srem('queues', $queue); |
|
| 176 | + return $num; |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | /** |
@@ -186,28 +186,28 @@ discard block |
||
| 186 | 186 | */ |
| 187 | 187 | public static function blpop(array $queues, $timeout) |
| 188 | 188 | { |
| 189 | - $list = array(); |
|
| 190 | - foreach($queues AS $queue) { |
|
| 189 | + $list = array(); |
|
| 190 | + foreach($queues AS $queue) { |
|
| 191 | 191 | $list[] = 'queue:' . $queue; |
| 192 | - } |
|
| 192 | + } |
|
| 193 | 193 | |
| 194 | - $item = self::redis()->blpop($list, (int)$timeout); |
|
| 194 | + $item = self::redis()->blpop($list, (int)$timeout); |
|
| 195 | 195 | |
| 196 | - if(!$item) { |
|
| 196 | + if(!$item) { |
|
| 197 | 197 | return; |
| 198 | - } |
|
| 198 | + } |
|
| 199 | 199 | |
| 200 | - /** |
|
| 201 | - * Normally the Resque_Redis class returns queue names without the prefix |
|
| 202 | - * But the blpop is a bit different. It returns the name as prefix:queue:name |
|
| 203 | - * So we need to strip off the prefix:queue: part |
|
| 204 | - */ |
|
| 205 | - $queue = substr($item[0], strlen(self::redis()->getPrefix() . 'queue:')); |
|
| 200 | + /** |
|
| 201 | + * Normally the Resque_Redis class returns queue names without the prefix |
|
| 202 | + * But the blpop is a bit different. It returns the name as prefix:queue:name |
|
| 203 | + * So we need to strip off the prefix:queue: part |
|
| 204 | + */ |
|
| 205 | + $queue = substr($item[0], strlen(self::redis()->getPrefix() . 'queue:')); |
|
| 206 | 206 | |
| 207 | - return array( |
|
| 207 | + return array( |
|
| 208 | 208 | 'queue' => $queue, |
| 209 | 209 | 'payload' => json_decode($item[1], true) |
| 210 | - ); |
|
| 210 | + ); |
|
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | /** |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | while (!$finished) { |
| 336 | 336 | $string = self::redis()->rpoplpush($requeueQueue, self::redis()->getPrefix() .$originalQueue); |
| 337 | 337 | if (empty($string)) { |
| 338 | - $finished = true; |
|
| 338 | + $finished = true; |
|
| 339 | 339 | } |
| 340 | 340 | } |
| 341 | 341 | |
@@ -358,29 +358,29 @@ discard block |
||
| 358 | 358 | */ |
| 359 | 359 | private static function matchItem($string, $items) |
| 360 | 360 | { |
| 361 | - $decoded = json_decode($string, true); |
|
| 361 | + $decoded = json_decode($string, true); |
|
| 362 | 362 | |
| 363 | - foreach($items as $key => $val) { |
|
| 363 | + foreach($items as $key => $val) { |
|
| 364 | 364 | # class name only ex: item[0] = ['class'] |
| 365 | 365 | if (is_numeric($key)) { |
| 366 | - if($decoded['class'] == $val) { |
|
| 366 | + if($decoded['class'] == $val) { |
|
| 367 | 367 | return true; |
| 368 | - } |
|
| 368 | + } |
|
| 369 | 369 | # class name with args , example: item[0] = ['class' => {'foo' => 1, 'bar' => 2}] |
| 370 | 370 | } elseif (is_array($val)) { |
| 371 | - $decodedArgs = (array)$decoded['args'][0]; |
|
| 372 | - if ($decoded['class'] == $key && |
|
| 371 | + $decodedArgs = (array)$decoded['args'][0]; |
|
| 372 | + if ($decoded['class'] == $key && |
|
| 373 | 373 | count($decodedArgs) > 0 && count(array_diff($decodedArgs, $val)) == 0) { |
| 374 | 374 | return true; |
| 375 | 375 | } |
| 376 | 376 | # class name with ID, example: item[0] = ['class' => 'id'] |
| 377 | 377 | } else { |
| 378 | - if ($decoded['class'] == $key && $decoded['id'] == $val) { |
|
| 378 | + if ($decoded['class'] == $key && $decoded['id'] == $val) { |
|
| 379 | 379 | return true; |
| 380 | - } |
|
| 380 | + } |
|
| 381 | 381 | } |
| 382 | - } |
|
| 383 | - return false; |
|
| 382 | + } |
|
| 383 | + return false; |
|
| 384 | 384 | } |
| 385 | 385 | |
| 386 | 386 | /** |
@@ -393,9 +393,9 @@ discard block |
||
| 393 | 393 | */ |
| 394 | 394 | private static function removeList($queue) |
| 395 | 395 | { |
| 396 | - $counter = self::size($queue); |
|
| 397 | - $result = self::redis()->del('queue:' . $queue); |
|
| 398 | - return ($result == 1) ? $counter : 0; |
|
| 396 | + $counter = self::size($queue); |
|
| 397 | + $result = self::redis()->del('queue:' . $queue); |
|
| 398 | + return ($result == 1) ? $counter : 0; |
|
| 399 | 399 | } |
| 400 | 400 | |
| 401 | 401 | /* |