File tree Expand file tree Collapse file tree 2 files changed +15
-4
lines changed Expand file tree Collapse file tree 2 files changed +15
-4
lines changed Original file line number Diff line number Diff line change @@ -146,7 +146,17 @@ public static function blpop(array $queues, $timeout)
146
146
return ;
147
147
}
148
148
149
- return json_decode ($ item [1 ], true );
149
+ /**
150
+ * Normally the Resque_Redis class returns queue names without the prefix
151
+ * But the blpop is a bit different. It returns the name as prefix:queue:name
152
+ * So we need to strip off the prefix:queue: part
153
+ */
154
+ $ queue = substr ($ item [0 ], strlen (self ::redis ()->getPrefix () . 'queue: ' ));
155
+
156
+ return array (
157
+ 'queue ' => $ queue ,
158
+ 'payload ' => json_decode ($ item [1 ], true )
159
+ );
150
160
}
151
161
152
162
/**
Original file line number Diff line number Diff line change @@ -100,12 +100,13 @@ public static function reserve($queue)
100
100
*/
101
101
public static function reserveBlocking (array $ queues , $ timeout = null )
102
102
{
103
- $ payload = Resque::blpop ($ queues , $ timeout );
104
- if (!is_array ($ payload )) {
103
+ $ item = Resque::blpop ($ queues , $ timeout );
104
+
105
+ if (!is_array ($ item )) {
105
106
return false ;
106
107
}
107
108
108
- return new Resque_Job ($ payload -> queue , $ payload );
109
+ return new Resque_Job ($ item [ ' queue ' ] , $ item [ ' payload ' ] );
109
110
}
110
111
111
112
/**
You can’t perform that action at this time.
0 commit comments