Permalink
...
Checking mergeability…
Don’t worry, you can still create the pull request.
Comparing changes
Open a pull request
84
contributors
This comparison is big! We’re only showing the most recent
250
commits
Unified
Split
Showing
with
1,609 additions
and 434 deletions.
- +1 −2 .gitignore
- +8 −0 .travis.yml
- +14 −0 Gemfile
- +169 −0 HISTORY.md
- +1 −1 LICENSE
- +183 −69 README.markdown
- +8 −8 Rakefile
- +36 −12 bin/resque
- +4 −0 bin/resque-web
- +0 −7 deps.rip
- +21 −1 docs/HOOKS.md
- +2 −2 examples/demo/README.markdown
- +1 −0 examples/demo/Rakefile
- +1 −0 examples/demo/config.ru
- +2 −1 examples/god/resque.god
- +3 −3 examples/monit/resque.monit
- +103 −28 lib/resque.rb
- +1 −1 lib/resque/errors.rb
- +32 −2 lib/resque/failure.rb
- +17 −0 lib/resque/failure/airbrake.rb
- +3 −0 lib/resque/failure/base.rb
- +17 −116 lib/resque/failure/hoptoad.rb
- +5 −1 lib/resque/failure/multiple.rb
- +13 −2 lib/resque/failure/redis.rb
- +33 −0 lib/resque/failure/thoughtbot.rb
- +38 −18 lib/resque/helpers.rb
- +36 −21 lib/resque/job.rb
- +20 −0 lib/resque/plugin.rb
- +73 −26 lib/resque/server.rb
- BIN lib/resque/server/public/favicon.ico
- +6 −0 lib/resque/server/public/ranger.js
- +0 −4 lib/resque/server/public/reset.css
- +9 −4 lib/resque/server/public/style.css
- +3 −3 lib/resque/server/test_helper.rb
- +25 −11 lib/resque/server/views/failed.erb
- +0 −1 lib/resque/server/views/key_sets.erb
- +4 −4 lib/resque/server/views/queues.erb
- +35 −4 lib/resque/server/views/workers.erb
- +10 −7 lib/resque/server/views/working.erb
- +25 −3 lib/resque/tasks.rb
- +1 −1 lib/resque/version.rb
- +90 −22 lib/resque/worker.rb
- +22 −20 { → lib}/tasks/redis.rake
- +2 −0 lib/tasks/resque.rake
- +3 −3 resque.gemspec
- +0 −2 tasks/resque.rake
- +27 −0 test/airbrake_test.rb
- +26 −0 test/hoptoad_test.rb
- +123 −2 test/job_hooks_test.rb
- +7 −7 test/job_plugins_test.rb
- +1 −1 test/plugin_test.rb
- +115 −0 test/redis-test-cluster.conf
- +6 −1 test/resque-web_test.rb
- +57 −4 test/resque_test.rb
- +56 −7 test/test_helper.rb
- +111 −2 test/worker_test.rb
View
3
.gitignore
@@ -1,2 +1 @@ | ||
-pkg | ||
-nbproject | ||
+Gemfile.lock |
View
8
.travis.yml
@@ -0,0 +1,8 @@ | ||
+rvm: | ||
+ - 1.8.7 | ||
+ - 1.9.2 | ||
+ - 1.9.3 | ||
+ - jruby-18mode | ||
+ - jruby-19mode | ||
+ - rbx-18mode | ||
+ - rbx-19mode |
View
14
Gemfile
@@ -0,0 +1,14 @@ | ||
+source :rubygems | ||
+ | ||
+gemspec | ||
+ | ||
+group :test do | ||
+ gem "rake" | ||
+ gem "rack-test", "~> 0.5" | ||
+ gem "mocha", "~> 0.9.7" | ||
+ gem "yajl-ruby", "~>0.8.2", :platforms => :mri | ||
+ gem "json", "~>1.5.3", :platforms => [:jruby, :rbx] | ||
+ gem "hoptoad_notifier" | ||
+ gem "airbrake" | ||
+ gem "i18n" | ||
+end |
View
169
HISTORY.md
@@ -1,3 +1,172 @@ | ||
+## 1.20.0 (2012-02-17) | ||
+ | ||
+* Fixed demos for ruby 1.9 (@BMorearty, #445) | ||
+* Fixed `#requeue` tests (@hone, #500) | ||
+* Web UI: optional trailing slashes of URLs (@elisehuard, #449) | ||
+* Allow * to appear anywhere in queue list (@tapajos, #405, #407) | ||
+* Wait for child with specific PID (@jacobkg) | ||
+* #decode raise takes a string when re-raising as a different exception class (Trevor Hart) | ||
+* Use Sinatra's `pubilc_folder` if it exists (@defunkt, #420, #421) | ||
+* Assign the job's worker before calling `before_fork` (@quirkey) | ||
+* Fix Resque::Helpers#constantize to work correctly on 1.9.2 (@rtlong) | ||
+* Added before & after hooks for dequeue (@humancopy, #398) | ||
+* daemonize support using `ENV["BACKGROUND"]` (@chrisleishman) | ||
+* requeue and remove failed jobs by queue name (@evanwhalen) | ||
+* `-r` flag for resque-web for redis connection (@gjastrab) | ||
+* Added `Resque.enqueue_to`: allows you to specif the queue and still run hooks (@dan-g) | ||
+* Web UI: Set the default encoding to UTF-8 (@elubow) | ||
+* fix finding worker pids on JRuby (John Andrews + Andrew Grieser) | ||
+* Added distributed redis support (@stipple) | ||
+* Added better failure hooks (@raykrueger) | ||
+* Added before & after dequeue hooks (@humancopy) | ||
+ | ||
+## 1.19.0 (2011-09-01) | ||
+ | ||
+* Added Airbrake (formerly Hoptoad) support. | ||
+* Web UI: Added retry all button to failed jobs page | ||
+* Web UI: Show focus outline | ||
+ | ||
+## 1.18.6 (2011-08-30) | ||
+ | ||
+* Bugfix: Use Rails 3 eager loading for resque:preload | ||
+ | ||
+## 1.18.5 (2011-08-24) | ||
+ | ||
+* Added support for Travis CI | ||
+* Bugfix: preload only happens in production Rails environment | ||
+ | ||
+## 1.18.4 (2011-08-23) | ||
+ | ||
+* Bugfix: preload task depends on setup | ||
+ | ||
+## 1.18.3 (2011-08-23) | ||
+ | ||
+* Bugfix: Fix preloading on Rails 3.x. | ||
+ | ||
+## 1.18.2 (2011-08-19) | ||
+ | ||
+* Fix RAILS_ROOT deprecation warning | ||
+ | ||
+## 1.18.1 (2011-08-19) | ||
+ | ||
+* Bugfix: Use RAILS_ROOT in preload task | ||
+ | ||
+## 1.18.0 (2011-08-18) | ||
+ | ||
+* Added before_enqueue hook. | ||
+* Resque workers now preload files under app/ in Rails | ||
+* Switch to MultiJSON | ||
+* Bugfix: Finding worker pids on Solaris | ||
+* Web UI: Fix NaN days ago for worker screens | ||
+* Web UI: Add Cache-Control header to prevent proxy caching | ||
+* Web UI: Update Resque.redis_id so it can be used in a distributed ring. | ||
+ | ||
+## 1.17.1 (2011-05-27) | ||
+ | ||
+* Reverted `exit` change. Back to `exit!`. | ||
+ | ||
+## 1.17.0 (2011-05-26) | ||
+ | ||
+* Workers exit with `exit` instead of `exit!`. This means you | ||
+ can now use `at_exit` hooks inside workers. | ||
+* More monit typo fixes. | ||
+* Fixed bug in Hoptoad backend. | ||
+* Web UI: Wrap preformatted arguments. | ||
+ | ||
+## 1.16.1 (2011-05-17) | ||
+ | ||
+* Bugfix: Resque::Failure::Hoptoad.configure works again | ||
+* Bugfix: Loading rake tasks | ||
+ | ||
+## 1.16.0 (2011-05-16) | ||
+ | ||
+* Optional Hoptoad backend extracted into hoptoad_notifier. Install the gem to use it. | ||
+* Added `Worker#paused?` method | ||
+* Bugfix: Properly reseed random number generator after forking. | ||
+* Bugfix: Resque.redis=(<a Redis::Namespace>) | ||
+* Bugfix: Monit example stdout/stderr redirection | ||
+* Bugfix: Removing single failure now works with multiple failure backends | ||
+* Web: 'Remove Queue' now requires confirmation | ||
+* Web: Favicon! | ||
+* Web Bugfix: Dates display in Safari | ||
+* Web Bugfix: Dates display timezone | ||
+* Web Bugfix: Race condition querying working workers | ||
+* Web Bugfix: Fix polling /workers/all in resque-web | ||
+ | ||
+## 1.15.0 (2011-03-18) | ||
+ | ||
+* Fallback to Redis.connect. Makes ENV variables and whatnot work. | ||
+* Fixed Sinatra 1.2 compatibility | ||
+ | ||
+## 1.14.0 (2011-03-17) | ||
+ | ||
+* Sleep interval can now be a float | ||
+* Added Resque.inline to allow in-process performing of jobs (for testing) | ||
+* Fixed tests for Ruby 1.9.2 | ||
+* Added Resque.validate(klass) to validate a Job | ||
+* Decode errors are no longer ignored to help debugging | ||
+* Web: Sinatra 1.2 compatibility | ||
+* Fixed after_enqueue hook to actually run in `Resque.enqueue` | ||
+* Fixed very_verbose timestamps to use 24 hour time (AM/PM wasn't included) | ||
+* Fixed monit example | ||
+* Fixed Worker#pid | ||
+ | ||
+## 1.13.0 (2011-02-07) | ||
+ | ||
+* Depend on redis-namespace >= 0.10 | ||
+* README tweaks | ||
+* Use thread_safe option when setting redis url | ||
+* Bugfix: worker pruning | ||
+ | ||
+## 1.12.0 (2011-02-03) | ||
+ | ||
+* Added pidfile writing from `rake resque:work` | ||
+* Added Worker#pid method | ||
+* Added configurable location for `rake install` | ||
+* Bugfix: Errors in failure backend are rescue'd | ||
+* Bugfix: Non-working workers no longer counted in "working" count | ||
+* Bugfix: Don't think resque-web is a worker | ||
+ | ||
+## 1.11.0 (2010-08-23) | ||
+ | ||
+* Web UI: Group /workers page by hostnames | ||
+ | ||
+## 1.10.0 (2010-08-23) | ||
+ | ||
+* Support redis:// string format in `Resque.redis=` | ||
+* Using new cross-platform JSON gem. | ||
+* Added `after_enqueue` plugin hook. | ||
+* Added `shutdown?` method which can be overridden. | ||
+* Added support for the "leftright" gem when running tests. | ||
+* Grammarfix: In the README | ||
+ | ||
+## 1.9.10 (2010-08-06) | ||
+ | ||
+* Bugfix: before_fork should get passed the job | ||
+ | ||
+## 1.9.9 (2010-07-26) | ||
+ | ||
+* Depend on redis-namespace 0.8.0 | ||
+* Depend on json_pure instead of json (for JRuby compat) | ||
+* Bugfix: rails_env display in stats view | ||
+ | ||
+## 1.9.8 (2010-07-20) | ||
+ | ||
+* Bugfix: Worker.all should never return nil | ||
+* monit example: Fixed Syntax Error and adding environment to the rake task | ||
+* redis rake task: Fixed typo in copy command | ||
+ | ||
+## 1.9.7 (2010-07-09) | ||
+ | ||
+* Improved memory usage in Job.destroy | ||
+* redis-namespace 0.7.0 now required | ||
+* Bugfix: Reverted $0 changes | ||
+* Web Bugfix: Payload-less failures in the web ui work | ||
+ | ||
+## 1.9.6 (2010-06-22) | ||
+ | ||
+* Bugfix: Rakefile logging works the same as all the other logging | ||
+ | ||
## 1.9.5 (2010-06-16) | ||
* Web Bugfix: Display the configured namespace on the stats page | ||
View
2
LICENSE
@@ -1,4 +1,4 @@ | ||
-Copyright (c) 2009 Chris Wanstrath | ||
+Copyright (c) Chris Wanstrath | ||
Permission is hereby granted, free of charge, to any person obtaining | ||
a copy of this software and associated documentation files (the | ||

Oops, something went wrong.