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

Merge branch 'blocking-list-pop' of github.com:ruudk/php-resque into blocking-list-pop

Browse Source 
Conflicts:
	bin/resque
	lib/Resque.php
	lib/Resque/Job.php
This commit is contained in:
Ruud Kamphuis 2013-05-29 09:31:53 +02:00
commit 2794dd54a9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Resque.php
View File

@ -62,7 +62,7 @@ class Resque
self::$redis = new Resque_Redis($server, self::$redisDatabase); self::$redis = new Resque_Redis($server, self::$redisDatabase);
return self::$redis; return self::$redis;
} }
/** /**
* fork() helper method for php-resque that handles issues PHP socket * fork() helper method for php-resque that handles issues PHP socket
* and phpredis have with passing around sockets between child/parent * and phpredis have with passing around sockets between child/parent

6
lib/Resque/Job.php
View File

@ -58,13 +58,11 @@ class Resque_Job
); );
} }
$id = md5(uniqid('', true)); $id = md5(uniqid('', true));
if (!Resque::push($queue, array( Resque::push($queue, array(
'class' => $class, 'class' => $class,
'args' => array($args), 'args' => array($args),
'id' => $id, 'id' => $id,
))) { ));
return false;
}
if($monitor) { if($monitor) {
Resque_Job_Status::create($id); Resque_Job_Status::create($id);