Commit Graph

165 Commits

Author SHA1 Message Date
Chris Boulton
055587abf0 Merge pull request #158 from ruudk/default-logger
Set Resque_Log in constructor
2014-06-26 21:00:42 +10:00
Chris Boulton
4442e1b2f1 Merge pull request #186 from iskandar/dsn-normalization
DSN and REDIS_BACKEND normalization
2014-06-26 19:14:43 +10:00
Chris Boulton
0327217907 call beforePerform before retrieving an instance of the job class 2014-06-26 19:07:52 +10:00
Dayson Pais
760e38c0ef Fixed syntax error 2014-05-26 22:01:49 +05:30
Dayson Pais
b242280ecd Removed erroneously introduced character. 2014-05-26 21:53:28 +05:30
Dayson Pais
65288538e3 More verbose logging if a Job throws an exception
Presently, the logger just logs the primary error message with no stack trace of additional debugging information. Type casting the exception to a string gives a much efficient output  and enables better debugging.
2014-05-26 17:16:19 +05:30
Iskandar Najmuddin
3b074a046a Revert file modes back to 644 2014-05-05 17:48:47 +00:00
Iskandar Najmuddin
506b769b90 Make parseDsn() method static, remove unused member vars 2014-05-05 15:08:00 +00:00
Iskandar Najmuddin
62ed620083 Put 'else' keyword on new line in keeping with project conventions 2014-05-05 15:00:20 +00:00
Iskandar Najmuddin
d1d2b3b354 Test for 'false' database value when not found in DSN 2014-05-05 14:55:01 +00:00
Iskandar Najmuddin
1abbad3f5e Improve comments and readability 2014-05-05 14:47:43 +00:00
Iskandar Najmuddin
ad33efbc67 Improve Resque_Redis DSN parsing.
- Allow for DSN URIs to work as expected.
- Backward-compatible with simple 'host:port' format.
- Does not parse DSNs provided in array format for Credis_Cluster.
2014-05-05 13:02:16 +00:00
Ruud Kamphuis
aeabb5bb20 Constructor on top with default logger 2013-12-20 12:24:24 +01:00
Ruud Kamphuis
cdc5c3f357 Set Resque_Log in constructor 2013-12-20 12:21:52 +01:00
Michael Alexander
f91352d810 Renamed references of token to id. 2013-11-18 10:02:03 +11:00
Michael Alexander
6d8cd501b7 Added token as an argument to the afterEnqueue callback 2013-11-12 13:11:48 +11:00
Chris Boulton
b3c93367e8 Merge pull request #127 from ptrofimov/bug/establishConnection
Resque/Worker: removed reestablishConnection
2013-09-06 18:04:18 -07:00
Richard K Miller
9335ef51b4 fix spaces that should be tabs 2013-09-04 16:12:12 -06:00
Richard K Miller
6ed8fc048f refactor process title to keep it DRY 2013-09-04 12:29:38 -06:00
Richard K Miller
62dfa93458 cli_set_process_title() available in PHP 5.5 to set proc title. This is preferred over the PECL function setproctitle(). 2013-09-04 10:30:35 -06:00
Petr Trofimov
10c1d0b75e Resque/Worker: removed reestablishConnection 2013-08-23 12:17:47 +03:00
Trent Petersen
25a804d93d Convert indentation in the Worker class.... to . . . . tabs
This was painful for me as a PSR 1-2 follower
2013-07-10 10:07:19 -05:00
Rockstar04
726e58a297 Added basic logging class for a fallback
Corrected unit tests for new code

Add partial unit coverage for logging class

Add newline to logTest file
2013-06-25 12:01:50 -07:00
Chris Boulton
59f617e639 Merge pull request #63 from ruudk/blocking-list-pop
Basic support for blocking list pop
2013-06-12 01:09:11 -07:00
Aaron Bonner
f3dcc092d4 Add type to $queue param in size()'s docblock 2013-05-29 15:59:46 +01:00
Ruud Kamphuis
2794dd54a9 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
2013-05-29 09:31:53 +02:00
Ruud Kamphuis
bfbff5e58e Unit tests pass 2013-05-29 09:29:24 +02:00
Ruud Kamphuis
f379d3a36d Fixed unit test 2013-05-29 09:17:06 +02:00
Ruud Kamphuis
86ae77811d Working blocking list pop :) 2013-05-29 09:17:06 +02:00
Ruud Kamphuis
b8f98eecd2 WIP 2013-05-29 09:14:18 +02:00
Ruud Kamphuis
15324ca410 Fixed bug 2013-05-29 09:14:17 +02:00
Ruud Kamphuis
4d5552867a Basic support for blocking list pop 2013-05-29 09:14:17 +02:00
Chris Boulton
37cdec8e11 Merge pull request #107 from danhunsaker/feature-queue-failure
Added enqueue failure detection
2013-05-28 18:19:01 -07:00
Daniel Hunsaker
8d1a9a5564 Updated to match coding style.
Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
2013-05-12 12:58:18 -06:00
Daniel Hunsaker
3798fa3ba6 Added enqueue failure detection
If a job fails to be enqueued, it would be useful to know it.  So now
Resque actually tells us whether the enqueue action was successful or
if it failed.  If your job ID comes back as FALSE, it didn't enqueue.

Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
2013-05-09 16:27:50 -06:00
CyrilMazur
e4ea683def Update Job.php
Previous code was encapsulating $args in an additional array, and thus breaking the new job $args.
2013-04-16 13:07:03 -03:00
Ruud Kamphuis
66fec608a1 Fixed unit test 2013-03-13 13:03:19 +01:00
Ruud Kamphuis
c2c4d06f7b Working blocking list pop :) 2013-03-13 12:41:32 +01:00
Ruud Kamphuis
132531e1a2 WIP 2013-03-12 11:28:25 +01:00
Ruud Kamphuis
5687c8fe82 Merge branch 'master' of git://github.com/chrisboulton/php-resque into blocking-list-pop
Conflicts:
	lib/Resque.php
	lib/Resque/RedisCluster.php
	lib/Resque/Worker.php
2013-03-11 22:40:36 +01:00
Chris Boulton
4cbf3c08c2 Merge pull request #89 from trimbletodd/master
Adding support for remote redis instances (such as redistogo) that require authentication
2013-03-06 19:55:01 -08:00
Corey Ballou
3b4c46e039 Fixed the Resque_Worker log method to properly handle NORMAL vs VERBOSE logging. 2013-02-21 07:37:16 -05:00
TrimbleTodd
6a429c2f21 adding support for remote redis instances (such as redistogo) that require authentication 2013-02-20 11:41:41 -05:00
Chris Boulton
6800fbe5ac fix compatibility with phpredis
* implement a fork helper method that closes the connection to redis before forking (instead of resetting after)
  to work around bugs with phpredis/socket fork handling
* phpredis does not automatically typecast to string, so worker name must be typecasted when registering
2013-01-13 02:59:06 +11:00
Chris Boulton
2ba15eb555 replace Redisent with Credis (also adds native phpredis support) 2013-01-12 23:37:38 +11:00
Chris Boulton
a6eb8e1c45 use __DIR__ 2013-01-12 23:07:15 +11:00
Chris Boulton
2f5b48930f make better use of composer across php-resque
* recommend php-resque be installed via Composer
* provide quick getting started steps
* move ./resque.php to bin/resque, make it available as a Composer bin
* have classes autoloaded via Composer (or some other means if not using Composer)
2013-01-12 22:40:26 +11:00
Daniel Hunsaker
5127aefa90 Update lib/Resque/Redis.php
Add SETEX to the list of commands which supply a key as the first argument.
2013-01-11 13:40:39 -07:00
Chris Boulton
5fdc3609e9 Merge pull request #77 from atorres757/fix-lost-connection
Fix for lost connection infinite loop
2012-12-28 19:12:02 -08:00
Allen Torres
fdc9f881e8 Reverted changes made from upstream master. 2012-12-28 10:42:16 -05:00
Allen Torres
a5b70a5cbd Added a sleep call for a second before establishing another connection. 2012-12-28 10:39:34 -05:00
Allen Torres
0afb87663f Reverted changes made to upstream master. 2012-12-28 10:33:32 -05:00
Allen Torres
e4f39a6093 Updated Redisent.php to attempt three reconnects to the redis server before giving up. Also supressed fwrite errors. 2012-12-28 09:33:09 -05:00
Tony Piper
7f1cf35a62 implement prefix removel 2012-11-26 15:23:57 +00:00
Allen Torres
f6334bb3b8 Added a check to see if we have args before we attempt to access the first item in the payload args to prevent an undefined index error. 2012-11-01 09:37:06 -04:00
Allen Torres
3955bc8edc Updated recreate method in Resque_Job class to set arguments in the same fashion as getAruments returns them. 2012-11-01 09:28:47 -04:00
Chris Boulton
0549d6c88a update version to 1.2 2012-10-13 18:28:16 +11:00
Chris Boulton
c908109a74 Remove silly copyright line in docblock comments, update email address, remove copyright year because it is boring to maintain 2012-10-13 17:55:41 +11:00
Ruud Kamphuis
5eff86d3c3 Fixed bug 2012-09-10 10:23:18 +02:00
scragg0x
a8a7db51ca Disable autoload for the class_exists func
I ran into an autoload problem because of this class_exists function.
So I set the second arg to false to prevent it from calling __autoload.  
It doesn't make sense to try (to autoload) anyway because it's going to 
declare a skeleton if the class doesn't exist.
2012-09-07 13:36:15 -05:00
Ruud Kamphuis
41bf8c1c26 Basic support for blocking list pop 2012-08-24 16:51:03 +02:00
Matt Heath
5b89607e4b Fix issue #19 by ensuring RedisException is not redeclared 2012-05-10 15:01:00 +01:00
Chris Boulton
b0fbfa4f15 make the queue for an enqueued job available in the afterEnqueue event 2012-05-10 22:13:28 +10:00
ebernhardson
fab92ef114 fix bug preventing stopListening from working 2012-04-04 18:13:07 -07:00
Chaitanya Kuber
76c06a1349 now setting the queue name onto the job instance 2012-03-22 12:27:43 +08:00
Chaitanya Kuber
cc871c06ab fixed spelling error and removed debug code 2012-03-15 20:03:34 -05:00
Chaitanya Kuber
48a7febd88 Merge branch 'master' of https://github.com/chrisboulton/php-resque 2012-03-06 22:48:01 -06:00
Chris Boulton
6651f957f1 Merge branch 'master' of github.com:chrisboulton/php-resque 2012-03-05 19:41:47 +11:00
Chris Boulton
0ad5903a85 Merge remote-tracking branch 'pedroarnal-master/master'
Conflicts:
	lib/Resque.php
2012-03-05 19:41:09 +11:00
Chris Boulton
37e148b23c Merge pull request #42 from salimane/upstream
Avoid working with dirty worker ids
2012-03-05 00:33:47 -08:00
Chris Boulton
ebe7665817 fix lost jobs when there is more than one worker process started by the same parent process 2012-03-05 19:21:43 +11:00
Chaitanya Kuber
3b59fa5dbc method comment changes 2012-03-01 19:21:58 -06:00
Chaitanya Kuber
ef859b6fc5 updated method comments 2012-03-01 19:21:06 -06:00
Chaitanya Kuber
8f06294048 method comments updated 2012-03-01 19:13:34 -06:00
Chaitanya Kuber
951d9d37b5 updated method comments 2012-02-29 22:32:52 -06:00
pedroarnal
782d0317e6 Update lib/Resque/Redis.php 2012-02-18 17:10:06 +01:00
Salimane Adjao Moustapha
5b24b471dc avoid working with dirty worker ids 2012-02-02 16:06:00 +08:00
pedroarnal
0ac835a630 Enabling use of unix sockets on Redis backend. 2012-01-25 00:46:34 +01:00
Salimane Adjao Moustapha
7a7cfbf2b9 fix comment to specify that is an array instead of an object in Resque::push 2011-12-16 10:32:28 +08:00
Salimane Adjao Moustapha
458fd6488b replace is_object with is_array when reserving jobs since Resque::pop actually returns an array instead of an object 2011-12-08 11:25:15 +08:00
Chris Boulton
cd47df2458 Merge pull request #18 from humancopy/master
A small fix for a small bug with __autoload and class_exists :)
2011-12-07 04:07:42 -08:00
Salimane Adjao Moustapha
68df9854a6 when reserving jobs, check if the payload received from popping a queue is a valid object (fix bug whereby jobs are reserved based on an erroneous payload) 2011-12-07 17:22:59 +08:00
Hélio Costa e Silva
016a7a13fd Added support of Redis prefix (namespaces) 2011-11-22 14:55:40 -02:00
humancopy
c52bcc8af7 Re-enable autoload for class_exists in Job.php 2011-11-02 11:59:33 +01:00
humancopy
599295ef9c Merge branch 'master' of git://github.com/chrisboulton/php-resque 2011-10-23 09:47:33 +02:00
Chris Boulton
3514a4f063 Move brace to new line 2011-09-24 15:40:20 +10:00
d11wtq
c90e21d88e Fix a bug where the worker would spin out of control taking the server with it, if the redis connection was interrupted even briefly. Use SIGPIPE to trap this scenario cleanly. 2011-09-24 15:08:53 +10:00
warezthebeef
0cfb2d2019 Fixed job arguments being wiped by array_shift 2011-08-19 12:33:05 +12:00
warezthebeef
f7eac3b5e7 Added wrapping array() to args to improve compatibility with ruby resque 2011-07-21 15:49:18 +12:00
Patrick Bajao
863099564e Modified setBackend() to accept as the second parameter 2011-06-14 17:33:38 +08:00
Patrick Bajao
27beb8cc20 Added database parameter in setBackend() to select the database for a connection. The default database is set to 0. 2011-06-14 17:33:37 +08:00
humancopy
cd3b0cca0e Set autoload to false for 'class_exists' calls. Currently it is not set, so the default is true which causes any defined '__autoload' function in the included app to be called. 2011-05-18 18:34:29 +02:00
chris.boulton
77f33c319b Move trigger call for onFailure in to ->fail(), so it can catch PHP errors 2011-03-27 19:18:16 +11:00
chris.boulton
3245c523c7 Add ability to fetch wildcarded list of queues a worker belongs to without it expanding them out using redis 2011-03-27 19:17:35 +11:00
chris.boulton
6f43fcfed8 Add a plugin/event/hook system 2011-03-27 18:42:46 +11:00
chris.boulton
25fac9a16a Fix undefined variable $child on non-forking operating systems 2011-03-27 16:01:56 +11:00
chris.boulton
0372a27ab7 Remove lambda and namespaces causing PHP 5.2 incompatibility 2011-03-27 15:02:06 +11:00
Oleg Topchiy
d39a5f57d6 updated redisent to make it redis 2.2 compatible 2011-02-25 21:41:54 +02:00
chris.boulton
4bc96dd88c require -> require_once 2010-12-16 16:16:32 +11:00
chris.boulton
c80b1048d8 Load Redisent from the correct location 2010-12-16 16:03:41 +11:00