Merge pull request #63 from ruudk/blocking-list-pop

Basic support for blocking list pop

bin/resque

@@ -3,40 +3,40 @@
 
 // Find and initialize Composer
 $files = array(
-  __DIR__ . '/../../vendor/autoload.php',
+    __DIR__ . '/../../vendor/autoload.php',
-  __DIR__ . '/../../../autoload.php',
+    __DIR__ . '/../../../autoload.php',
-  __DIR__ . '/../../../../autoload.php',
+    __DIR__ . '/../../../../autoload.php',
-  __DIR__ . '/../vendor/autoload.php',
+    __DIR__ . '/../vendor/autoload.php',
 );
 
 $found = false;
 foreach ($files as $file) {
-	if (file_exists($file)) {
+    if (file_exists($file)) {
-		require_once $file;
+        require_once $file;
-		break;
+        break;
-	}
+    }
 }
 
 if (!class_exists('Composer\Autoload\ClassLoader', false)) {
-	die(
+    die(
-		'You need to set up the project dependencies using the following commands:' . PHP_EOL .
+        'You need to set up the project dependencies using the following commands:' . PHP_EOL .
-		'curl -s http://getcomposer.org/installer | php' . PHP_EOL .
+            'curl -s http://getcomposer.org/installer | php' . PHP_EOL .
-		'php composer.phar install' . PHP_EOL
+            'php composer.phar install' . PHP_EOL
-	);
+    );
 }
 
 $QUEUE = getenv('QUEUE');
 if(empty($QUEUE)) {
-	die("Set QUEUE env var containing the list of queues to work.\n");
+    die("Set QUEUE env var containing the list of queues to work.\n");
 }
 
 $REDIS_BACKEND = getenv('REDIS_BACKEND');
 $REDIS_BACKEND_DB = getenv('REDIS_BACKEND_DB');
 if(!empty($REDIS_BACKEND)) {
-	if (empty($REDIS_BACKEND_DB)) 
+    if (empty($REDIS_BACKEND_DB))
-		Resque::setBackend($REDIS_BACKEND);
+        Resque::setBackend($REDIS_BACKEND);
-	else
+    else
-		Resque::setBackend($REDIS_BACKEND, $REDIS_BACKEND_DB);
+        Resque::setBackend($REDIS_BACKEND, $REDIS_BACKEND_DB);
 }
 
 $logLevel = 0;
@@ -44,31 +44,33 @@ $LOGGING = getenv('LOGGING');
 $VERBOSE = getenv('VERBOSE');
 $VVERBOSE = getenv('VVERBOSE');
 if(!empty($LOGGING) || !empty($VERBOSE)) {
-	$logLevel = Resque_Worker::LOG_NORMAL;
+    $logLevel = Resque_Worker::LOG_NORMAL;
 }
 else if(!empty($VVERBOSE)) {
-	$logLevel = Resque_Worker::LOG_VERBOSE;
+    $logLevel = Resque_Worker::LOG_VERBOSE;
 }
 
 $APP_INCLUDE = getenv('APP_INCLUDE');
 if($APP_INCLUDE) {
-	if(!file_exists($APP_INCLUDE)) {
+    if(!file_exists($APP_INCLUDE)) {
-		die('APP_INCLUDE ('.$APP_INCLUDE.") does not exist.\n");
+        die('APP_INCLUDE ('.$APP_INCLUDE.") does not exist.\n");
-	}
+    }
 
-	require_once $APP_INCLUDE;
+    require_once $APP_INCLUDE;
 }
 
+$BLOCKING = getenv('BLOCKING') !== FALSE;
+
 $interval = 5;
 $INTERVAL = getenv('INTERVAL');
 if(!empty($INTERVAL)) {
-	$interval = $INTERVAL;
+    $interval = $INTERVAL;
 }
 
 $count = 1;
 $COUNT = getenv('COUNT');
 if(!empty($COUNT) && $COUNT > 1) {
-	$count = $COUNT;
+    $count = $COUNT;
 }
 
 $PREFIX = getenv('PREFIX');
@@ -78,35 +80,35 @@ if(!empty($PREFIX)) {
 }
 
 if($count > 1) {
-	for($i = 0; $i < $count; ++$i) {
+    for($i = 0; $i < $count; ++$i) {
-		$pid = Resque::fork();
+        $pid = Resque::fork();
-		if($pid == -1) {
+        if($pid == -1) {
-			die("Could not fork worker ".$i."\n");
+            die("Could not fork worker ".$i."\n");
-		}
+        }
-		// Child, start the worker
+        // Child, start the worker
-		else if(!$pid) {
+        else if(!$pid) {
-			$queues = explode(',', $QUEUE);
+            $queues = explode(',', $QUEUE);
-			$worker = new Resque_Worker($queues);
+            $worker = new Resque_Worker($queues);
-			$worker->logLevel = $logLevel;
+            $worker->logLevel = $logLevel;
-			fwrite(STDOUT, '*** Starting worker '.$worker."\n");
+            fwrite(STDOUT, '*** Starting worker '.$worker."\n");
-			$worker->work($interval);
+            $worker->work($interval, $BLOCKING);
-			break;
+            break;
-		}
+        }
-	}
+    }
 }
 // Start a single worker
 else {
-	$queues = explode(',', $QUEUE);
+    $queues = explode(',', $QUEUE);
-	$worker = new Resque_Worker($queues);
+    $worker = new Resque_Worker($queues);
-	$worker->logLevel = $logLevel;
+    $worker->logLevel = $logLevel;
 
-	$PIDFILE = getenv('PIDFILE');
+    $PIDFILE = getenv('PIDFILE');
-	if ($PIDFILE) {
+    if ($PIDFILE) {
-		file_put_contents($PIDFILE, getmypid()) or
+        file_put_contents($PIDFILE, getmypid()) or
-			die('Could not write PID information to ' . $PIDFILE);
+            die('Could not write PID information to ' . $PIDFILE);
-	}
+    }
 
-	fwrite(STDOUT, '*** Starting worker '.$worker."\n");
+    fwrite(STDOUT, '*** Starting worker '.$worker."\n");
-	$worker->work($interval);
+    $worker->work($interval, $BLOCKING);
 }
 ?>

composer.json

@@ -20,7 +20,7 @@
 	"require": {
 		"php": ">=5.3.0",
 		"ext-pcntl": "*",
-		"colinmollenhour/credis": "dev-master"
+		"colinmollenhour/credis": "1.2.*"
 	},
 	"suggest": {
 		"ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.",

composer.lock

@@ -1,24 +1,27 @@
 {
-    "hash": "d37909ad0ffc11ed4d1e67dcaabe00b2",
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+    ],
+    "hash": "1f551c3cdade1b7ff7d9e32a44eeb3dc",
     "packages": [
         {
             "name": "colinmollenhour/credis",
-            "version": "dev-master",
+            "version": "1.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/chrisboulton/credis",
+                "url": "https://github.com/colinmollenhour/credis.git",
-                "reference": "62c73dd16e08069e3fd8f224cb4a5ddd73db8095"
+                "reference": "1.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/chrisboulton/credis/zipball/62c73dd16e08069e3fd8f224cb4a5ddd73db8095",
+                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/1.2",
-                "reference": "62c73dd16e08069e3fd8f224cb4a5ddd73db8095",
+                "reference": "1.2",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
-            "time": "2013-01-12 10:15:31",
             "type": "library",
             "autoload": {
                 "classmap": [
@@ -26,6 +29,7 @@
                     "Cluster.php"
                 ]
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -37,17 +41,424 @@
             ],
             "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
             "homepage": "https://github.com/colinmollenhour/credis",
-            "support": {
+            "time": "2013-03-19 02:57:04"
-                "source": "https://github.com/chrisboulton/credis/tree/master"
+        }
-            }
+    ],
+    "packages-dev": [
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "1.2.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "1.2.9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.9",
+                "reference": "1.2.9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": ">=1.3.0@stable",
+                "phpunit/php-text-template": ">=1.1.1@stable",
+                "phpunit/php-token-stream": ">=1.1.3@stable"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.0.5"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2013-02-26 18:55:56"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.3.3",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "1.3.3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator/zipball/1.3.3",
+                "reference": "1.3.3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "File/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2012-10-11 04:44:38"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.1.4",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "1.1.4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-text-template/zipball/1.1.4",
+                "reference": "1.1.4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "Text/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2012-10-31 11:15:28"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-timer.git",
+                "reference": "1.0.4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-timer/zipball/1.0.4",
+                "reference": "1.0.4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2012-10-11 04:45:58"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.1.5",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "1.1.5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-token-stream/zipball/1.1.5",
+                "reference": "1.1.5",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2012-10-11 04:47:14"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "3.7.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "3.7.18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.18",
+                "reference": "3.7.18",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpunit/php-code-coverage": ">=1.2.1,<1.3.0",
+                "phpunit/php-file-iterator": ">=1.3.1",
+                "phpunit/php-text-template": ">=1.1.1",
+                "phpunit/php-timer": ">=1.0.2,<1.1.0",
+                "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0",
+                "symfony/yaml": ">=2.2.0"
+            },
+            "require-dev": {
+                "pear-pear/pear": "1.9.4"
+            },
+            "suggest": {
+                "ext-json": "*",
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "phpunit/php-invoker": ">=1.1.0,<1.2.0"
+            },
+            "bin": [
+                "composer/bin/phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.7.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "",
+                "../../symfony/yaml/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2013-03-07 21:45:39"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "1.2.3",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "1.2.3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.3.zip",
+                "reference": "1.2.3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": ">=1.1.1@stable"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2013-01-13 10:24:48"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.2.0",
+            "target-dir": "Symfony/Component/Yaml",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml.git",
+                "reference": "v2.2.0-RC3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.0-RC3",
+                "reference": "v2.2.0-RC3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Yaml\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "http://symfony.com",
+            "time": "2013-01-27 16:49:19"
         }
     ],
-    "packages-dev": null,
     "aliases": [
 
     ],
     "minimum-stability": "stable",
-    "stability-flags": {
+    "stability-flags": [
-        "colinmollenhour/credis": 20
+
-    }
+    ],
+    "platform": {
+        "php": ">=5.3.0",
+        "ext-pcntl": "*"
+    },
+    "platform-dev": [
+
+    ]
 }

demo/bad_job.php

@@ -6,4 +6,3 @@ class Bad_PHP_Job
 		throw new Exception('Unable to run this job!');
 	}
 }
-?>

demo/check_status.php

@@ -18,4 +18,3 @@ while(true) {
 	fwrite(STDOUT, "Status of ".$argv[1]." is: ".$status->get()."\n");
 	sleep(1);
 }
-?>

demo/job.php

@@ -3,8 +3,8 @@ class PHP_Job
 {
 	public function perform()
 	{
-		sleep(120);
+        fwrite(STDOUT, 'Start job! -> ');
-		fwrite(STDOUT, 'Hello!');
+		sleep(1);
+		fwrite(STDOUT, 'Job ended!' . PHP_EOL);
 	}
 }
-?>

demo/long_job.php

@@ -6,4 +6,3 @@ class Long_PHP_Job
 		sleep(600);
 	}
 }
-?>

demo/php_error_job.php

@@ -6,4 +6,3 @@ class PHP_Error_Job
 		callToUndefinedFunction();
 	}
 }
-?>

demo/queue.php

@@ -14,6 +14,5 @@ $args = array(
 	),
 );
 
-$jobId = Resque::enqueue('default', $argv[1], $args, true);
+$jobId = Resque::enqueue($argv[1], $argv[2], $args, true);
 echo "Queued job ".$jobId."\n\n";
-?>

demo/resque.php

@@ -4,5 +4,4 @@ require 'bad_job.php';
 require 'job.php';
 require 'php_error_job.php';
 
-require '../bin/resque';
+require '../bin/resque.php';
-?>

lib/Resque.php

@@ -10,6 +10,8 @@ class Resque
 {
 	const VERSION = '1.2';
 
+    const DEFAULT_INTERVAL = 5;
+
 	/**
 	 * @var Resque_Redis Instance of Resque_Redis that talks to redis.
 	 */
@@ -114,7 +116,8 @@ class Resque
 	 */
 	public static function pop($queue)
 	{
-		$item = self::redis()->lpop('queue:' . $queue);
+        $item = self::redis()->lpop('queue:' . $queue);
+
 		if(!$item) {
 			return;
 		}
@@ -122,6 +125,40 @@ class Resque
 		return json_decode($item, true);
 	}
 
+    /**
+     * Pop an item off the end of the specified queues, using blocking list pop,
+     * decode it and return it.
+     *
+     * @param array         $queues
+     * @param int           $timeout
+     * @return null|array   Decoded item from the queue.
+     */
+    public static function blpop(array $queues, $timeout)
+    {
+        $list = array();
+        foreach($queues AS $queue) {
+            $list[] = 'queue:' . $queue;
+        }
+
+        $item = self::redis()->blpop($list, (int)$timeout);
+
+        if(!$item) {
+            return;
+        }
+
+        /**
+         * Normally the Resque_Redis class returns queue names without the prefix
+         * But the blpop is a bit different. It returns the name as prefix:queue:name
+         * So we need to strip off the prefix:queue: part
+         */
+        $queue = substr($item[0], strlen(self::redis()->getPrefix() . 'queue:'));
+
+        return array(
+            'queue'   => $queue,
+            'payload' => json_decode($item[1], true)
+        );
+    }
+
 	/**
 	 * Return the size (number of pending jobs) of the specified queue.
 	 *

lib/Resque/Job.php

@@ -58,13 +58,11 @@ class Resque_Job
 			);
 		}
 		$id = md5(uniqid('', true));
-		if (!Resque::push($queue, array(
+		Resque::push($queue, array(
 			'class'	=> $class,
 			'args'	=> array($args),
 			'id'	=> $id,
-		))) {
+		));
-			return false;
-		}
 
 		if($monitor) {
 			Resque_Job_Status::create($id);
@@ -73,22 +71,41 @@ class Resque_Job
 		return $id;
 	}
 
-	/**
+    /**
-	 * Find the next available job from the specified queue and return an
+     * Find the next available job from the specified queue and return an
-	 * instance of Resque_Job for it.
+     * instance of Resque_Job for it.
-	 *
+     *
-	 * @param string $queue The name of the queue to check for a job in.
+     * @param string $queue The name of the queue to check for a job in.
-	 * @return null|object Null when there aren't any waiting jobs, instance of Resque_Job when a job was found.
+     * @return null|object Null when there aren't any waiting jobs, instance of Resque_Job when a job was found.
-	 */
+     */
-	public static function reserve($queue)
+    public static function reserve($queue)
-	{
+    {
-		$payload = Resque::pop($queue);
+        $payload = Resque::pop($queue);
-		if(!is_array($payload)) {
+        if(!is_array($payload)) {
-			return false;
+            return false;
-		}
+        }
 
-		return new Resque_Job($queue, $payload);
+        return new Resque_Job($queue, $payload);
-	}
+    }
+
+    /**
+     * Find the next available job from the specified queues using blocking list pop
+     * and return an instance of Resque_Job for it.
+     *
+     * @param array             $queues
+     * @param int               $timeout
+     * @return null|object Null when there aren't any waiting jobs, instance of Resque_Job when a job was found.
+     */
+    public static function reserveBlocking(array $queues, $timeout = null)
+    {
+        $item = Resque::blpop($queues, $timeout);
+
+        if(!is_array($item)) {
+            return false;
+        }
+
+        return new Resque_Job($item['queue'], $item['payload']);
+    }
 
 	/**
 	 * Update the status of the current job.
@@ -153,7 +170,7 @@ class Resque_Job
 			);
 		}
 
-		$this->instance = new $this->payload['class']();
+		$this->instance = new $this->payload['class'];
 		$this->instance->job = $this;
 		$this->instance->args = $this->getArguments();
 		$this->instance->queue = $this->queue;

lib/Resque/Redis.php

@@ -47,6 +47,7 @@ class Resque_Redis
 		'lset',
 		'lrem',
 		'lpop',
+		'blpop',
 		'rpop',
 		'sadd',
 		'srem',
@@ -142,7 +143,13 @@ class Resque_Redis
 	 */
 	public function __call($name, $args) {
 		if(in_array($name, $this->keyCommands)) {
-		    $args[0] = self::$defaultNamespace . $args[0];
+            if(is_array($args[0])) {
+                foreach($args[0] AS $i => $v) {
+                    $args[0][$i] = self::$defaultNamespace . $v;
+                }
+            } else {
+                $args[0] = self::$defaultNamespace . $args[0];
+            }
 		}
 		try {
 			return $this->driver->__call($name, $args);

lib/Resque/Worker.php

@@ -147,75 +147,88 @@ class Resque_Worker
 	 *
 	 * @param int $interval How often to check for new jobs across the queues.
 	 */
-	public function work($interval = 5)
+	public function work($interval = Resque::DEFAULT_INTERVAL, $blocking = false)
 	{
 		$this->updateProcLine('Starting');
 		$this->startup();
 
-		while(true) {
+        while(true) {
-			if($this->shutdown) {
+            if($this->shutdown) {
-				break;
+                break;
-			}
+            }
 
-			// Attempt to find and reserve a job
+            // Attempt to find and reserve a job
-			$job = false;
+            $job = false;
-			if(!$this->paused) {
+            if(!$this->paused) {
-				$job = $this->reserve();
+                if($blocking === true) {
-			}
+                    $this->log('Starting blocking with timeout of ' . $interval, self::LOG_VERBOSE);
+                    $this->updateProcLine('Waiting for ' . implode(',', $this->queues) . ' with blocking timeout ' . $interval);
+                } else {
+                    $this->updateProcLine('Waiting for ' . implode(',', $this->queues) . ' with interval ' . $interval);
+                }
 
-			if(!$job) {
+                $job = $this->reserve($blocking, $interval);
-				// For an interval of 0, break now - helps with unit testing etc
+            }
-				if($interval == 0) {
-					break;
-				}
-				// If no job was found, we sleep for $interval before continuing and checking again
-				$this->log('Sleeping for ' . $interval, self::LOG_VERBOSE);
-				if($this->paused) {
-					$this->updateProcLine('Paused');
-				}
-				else {
-					$this->updateProcLine('Waiting for ' . implode(',', $this->queues));
-				}
-				usleep($interval * 1000000);
-				continue;
-			}
 
-			$this->log('got ' . $job);
+            if(!$job) {
-			Resque_Event::trigger('beforeFork', $job);
+                // For an interval of 0, break now - helps with unit testing etc
-			$this->workingOn($job);
+                if($interval == 0) {
+                    break;
+                }
 
-			$this->child = Resque::fork();
+                if($blocking === false)
+                {
+                    // If no job was found, we sleep for $interval before continuing and checking again
+                    $this->log('Sleeping for ' . $interval, self::LOG_VERBOSE);
+                    if($this->paused) {
+                        $this->updateProcLine('Paused');
+                    }
+                    else {
+                        $this->updateProcLine('Waiting for ' . implode(',', $this->queues));
+                    }
 
-			// Forked and we're the child. Run the job.
+                    usleep($interval * 1000000);
-			if ($this->child === 0 || $this->child === false) {
+                }
-				$status = 'Processing ' . $job->queue . ' since ' . strftime('%F %T');
-				$this->updateProcLine($status);
-				$this->log($status, self::LOG_VERBOSE);
-				$this->perform($job);
-				if ($this->child === 0) {
-					exit(0);
-				}
-			}
 
-			if($this->child > 0) {
+                continue;
-				// Parent process, sit and wait
+            }
-				$status = 'Forked ' . $this->child . ' at ' . strftime('%F %T');
-				$this->updateProcLine($status);
-				$this->log($status, self::LOG_VERBOSE);
 
-				// Wait until the child process finishes before continuing
+            $this->log('got ' . $job);
-				pcntl_wait($status);
+            Resque_Event::trigger('beforeFork', $job);
-				$exitStatus = pcntl_wexitstatus($status);
+            $this->workingOn($job);
-				if($exitStatus !== 0) {
-					$job->fail(new Resque_Job_DirtyExitException(
-						'Job exited with exit code ' . $exitStatus
-					));
-				}
-			}
 
-			$this->child = null;
+            $this->child = Resque::fork();
-			$this->doneWorking();
+
-		}
+            // Forked and we're the child. Run the job.
+            if ($this->child === 0 || $this->child === false) {
+                $status = 'Processing ' . $job->queue . ' since ' . strftime('%F %T');
+                $this->updateProcLine($status);
+                $this->log($status, self::LOG_VERBOSE);
+                $this->perform($job);
+                if ($this->child === 0) {
+                    exit(0);
+                }
+            }
+
+            if($this->child > 0) {
+                // Parent process, sit and wait
+                $status = 'Forked ' . $this->child . ' at ' . strftime('%F %T');
+                $this->updateProcLine($status);
+                $this->log($status, self::LOG_VERBOSE);
+
+                // Wait until the child process finishes before continuing
+                pcntl_wait($status);
+                $exitStatus = pcntl_wexitstatus($status);
+                if($exitStatus !== 0) {
+                    $job->fail(new Resque_Job_DirtyExitException(
+                        'Job exited with exit code ' . $exitStatus
+                    ));
+                }
+            }
+
+            $this->child = null;
+            $this->doneWorking();
+        }
 
 		$this->unregisterWorker();
 	}
@@ -241,28 +254,37 @@ class Resque_Worker
 		$this->log('done ' . $job);
 	}
 
-	/**
+    /**
-	 * Attempt to find a job from the top of one of the queues for this worker.
+     * @param  bool            $blocking
-	 *
+     * @param  int             $timeout
-	 * @return object|boolean Instance of Resque_Job if a job is found, false if not.
+     * @return object|boolean               Instance of Resque_Job if a job is found, false if not.
-	 */
+     */
-	public function reserve()
+    public function reserve($blocking = false, $timeout = null)
-	{
+    {
-		$queues = $this->queues();
+        $queues = $this->queues();
-		if(!is_array($queues)) {
+        if(!is_array($queues)) {
-			return;
+            return;
-		}
+        }
-		foreach($queues as $queue) {
-			$this->log('Checking ' . $queue, self::LOG_VERBOSE);
-			$job = Resque_Job::reserve($queue);
-			if($job) {
-				$this->log('Found job on ' . $queue, self::LOG_VERBOSE);
-				return $job;
-			}
-		}
 
-		return false;
+        if($blocking === true) {
-	}
+            $job = Resque_Job::reserveBlocking($queues, $timeout);
+            if($job) {
+                $this->log('Found job on ' . $job->queue, self::LOG_VERBOSE);
+                return $job;
+            }
+        } else {
+            foreach($queues as $queue) {
+                $this->log('Checking ' . $queue, self::LOG_VERBOSE);
+                $job = Resque_Job::reserve($queue);
+                if($job) {
+                    $this->log('Found job on ' . $queue, self::LOG_VERBOSE);
+                    return $job;
+                }
+            }
+        }
+
+        return false;
+    }
 
 	/**
 	 * Return an array containing all of the queues that this worker should use

test/Resque/Tests/JobStatusTest.php

@@ -8,6 +8,11 @@
  */
 class Resque_Tests_JobStatusTest extends Resque_Tests_TestCase
 {
+    /**
+     * @var \Resque_Worker
+     */
+    protected $worker;
+
 	public function setUp()
 	{
 		parent::setUp();
@@ -36,6 +41,7 @@ class Resque_Tests_JobStatusTest extends Resque_Tests_TestCase
 		$status = new Resque_Job_Status($token);
 		$this->assertEquals(Resque_Job_Status::STATUS_WAITING, $status->get());
 	}
+
 	public function testRunningJobReturnsRunningStatus()
 	{
 		$token = Resque::enqueue('jobs', 'Failing_Job', null, true);

test/Resque/Tests/WorkerTest.php

@@ -247,4 +247,27 @@ class Resque_Tests_WorkerTest extends Resque_Tests_TestCase
 
 		$this->assertEquals(1, Resque_Stat::get('failed'));
 	}
+
+    public function testBlockingListPop()
+    {
+        $worker = new Resque_Worker('jobs');
+        $worker->registerWorker();
+
+        Resque::enqueue('jobs', 'Test_Job_1');
+        Resque::enqueue('jobs', 'Test_Job_2');
+
+        $i = 1;
+        while($job = $worker->reserve(true, 1))
+        {
+            $this->assertEquals('Test_Job_' . $i, $job->payload['class']);
+
+            if($i == 2) {
+                break;
+            }
+
+            $i++;
+        }
+
+        $this->assertEquals(2, $i);
+    }
 }