Skip to content

Commit 2794dd5

Browse files
committed
Merge branch 'blocking-list-pop' of github.com:ruudk/php-resque into blocking-list-pop
Conflicts: bin/resque lib/Resque.php lib/Resque/Job.php
2 parents bfbff5e + 66fec60 commit 2794dd5

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

lib/Resque.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static function redis()
6262
self::$redis = new Resque_Redis($server, self::$redisDatabase);
6363
return self::$redis;
6464
}
65-
65+
6666
/**
6767
* fork() helper method for php-resque that handles issues PHP socket
6868
* and phpredis have with passing around sockets between child/parent

lib/Resque/Job.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,11 @@ public static function create($queue, $class, $args = null, $monitor = false)
5858
);
5959
}
6060
$id = md5(uniqid('', true));
61-
if (!Resque::push($queue, array(
61+
Resque::push($queue, array(
6262
'class' => $class,
6363
'args' => array($args),
6464
'id' => $id,
65-
))) {
66-
return false;
67-
}
65+
));
6866

6967
if($monitor) {
7068
Resque_Job_Status::create($id);

0 commit comments

Comments
 (0)