Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Oct 24, 2010
@stephencelis stephencelis Additional Hoptoad configuration support. a488d0b
@nirvdrum nirvdrum Use text/html since it is HTML and this helps with mod_proxy_html. 7055fca
Commits on Nov 03, 2010
@defunkt defunkt the future bf41357
Commits on Nov 06, 2010
@defunkt defunkt It's pronounced 'rescue' 52b4a28
Commits on Feb 03, 2011
@sgonyea sgonyea Fixed links for deploying rack apps 6a3a283
@lazyatom lazyatom Log any catastrophic issues when reserving, but still raise the error…
… so that resque dies.
@mrduncan mrduncan Strip whitespace from queue names 7027d71
@mrduncan mrduncan Remove trailing whitespace from readme 7ca0bf3
@cokron cokron be more precise when getting pid's of resque workers to kill: do NOT …
…kill resque-web
@jamster jamster updated rake install tasks to allow user to choose an install directo…
…ry by adding INSTALL_DIR=/your/path/here to the command line args
@jamster jamster updated desc on rake task f5500f1
@defunkt defunkt whitespace 223c559
@nirvdrum nirvdrum Deal with a changed in mapped_get semantics in redis-rb.
Previously the method stripped out keys with nil values, now it returns them, so we need to strip out the keys with nil values.
Commits on Feb 04, 2011
@christiannelson christiannelson Write out worker pid to PIDFILE if specified. 5765fe1
@kemper kemper fixed a defect where exceptions in the failure backend would cause th…
…e chile process to terminate like the parent
@morgoth morgoth added Worker#pid method c181644
@defunkt defunkt 1.12.0 e19b83e
@paulrosania paulrosania Accept namespaces in `resque` command f26934c
@defunkt defunkt vegas and sinatra 1a1f493
@defunkt defunkt redis-namespace 0.10 00e04e7
@kneath kneath Suggest sending pull requests instead of issues f687521
@mrduncan mrduncan Cleanup trailing whitespace 1f09e4c
@defunkt defunkt time is an illusion 26a14bc
@mrduncan mrduncan Using thread_safe option when setting redis url 2ee219e
Commits on Feb 07, 2011
Tom Brow fix erroneous pruning of living workers c2cbcc1
@defunkt defunkt 1.13.0 a8f8fe5
Commits on Feb 16, 2011
@bogdan bogdan Resque.validate!(klass) method implementation
Method used to determine is the given klass could be a valid Resque job
Commits on Mar 04, 2011
@morgoth morgoth fixed actual pid of running worker 67317e7
@defunkt defunkt int 17a32c5
Commits on Mar 17, 2011
@plashchynski plashchynski Fix monit example. f48da5f
@mrduncan mrduncan Simplifying by using worker pid dbd04d6
@bendiken bendiken Allowed the poll interval to be specified as a floating point number.
This enables using poll intervals shorter than a second; for example, specifying INTERVAL=0.25 is now possible.
@EdvardM EdvardM do not ignore decode errors 3d9daa8
Ryan Glover Adds bundler support d10fdf5
@josh josh Add link to remove individual failed jobs 7b6f3e9
@phiggins phiggins Fix tests for 1.9.2. c9abf3c
@andreacampi andreacampi Pass /notice/server-environment/project-root.
According to Hoptoad API documentation this is
optional, but some third-party software using the
same API is more strict and errors out if we don't
provide it (Redmine, I'm looking at you).
@lazyatom lazyatom Don't crash if unparseable values exist on the failure queue.
We saw some jobs become unloadable on our resque queue, due to issues turning strangely-encoded strings into JSON and back. This meant that resque couldn't parse the jobs, and so we were seeing `nil` elements in the `failures` array.

This is the simplest way of preventing these malformed entries from preventing monitoring of the failures queue entirely.
@bogdan bogdan Resque.inline configuration support
In order perform Resque jobs inline introduced
Resque.inline attribute.
@defunkt defunkt Protect our sleep interval with a Float() 855b2e6
@guilleiguaran guilleiguaran Renaming server url method to url_path to avoid conflicting with Sina…
…tra 1.2 url helper
@defunkt defunkt failing after_enqueue test 22970a2
Aaron Peckham & Michael Sofaer very_verbose works in the afternoon 69d5d40
@defunkt defunkt Put deps back in gemspec 200ec0f
@defunkt defunkt Call after_enqueue hook in `Resque.enqueue`. Fixes #169 b8220b2
@defunkt defunkt Job.validate! => Resque.validate 06b3936
@defunkt defunkt 1.14.0 c46b3b8
Commits on Mar 18, 2011
@lazyatom lazyatom The `url` method only exists with Sinatra 1.2 b7d5dd6
@morgoth morgoth initalize default redis connection by redis gem 39186f6
@defunkt defunkt Remove .gitignore
If you want to ignore files specific to your IDE,
set a global ignore.

See for more info.
Commits on Mar 19, 2011
@defunkt defunkt 1.15.0 b569484
Commits on Mar 22, 2011
@cehoffman cehoffman Hook individual failure removal into multiple failure backend 246a082
Commits on Mar 23, 2011
@lucasmundim lucasmundim Fix "Worker doesn't exist" when using poll at /workers/all in resque-web ae2828a
Commits on Mar 25, 2011
Matt Conway fix race condition in resque web 4d0abb0
Commits on Apr 08, 2011
Adman65 Order matters for hoptoad api 5781ca1
Commits on Apr 11, 2011
@lazyatom lazyatom This button is far, far too powerful to be able to accidentally click. e8ac456
Commits on Apr 12, 2011
@ono ono Add timezone to failed_at/retried_at on resque-web to show relative t…
…ime correctly when a viewer is in a different timezone from a server.
Commits on Apr 14, 2011
@jlecour jlecour Fix the Monit example
there should be a combo redirection (stdout AND stderr) to the log file
instead of a (useless) process detachment and a simple stdout redirection.
Commits on Apr 19, 2011
@toddthomas toddthomas Add test for Resque.redis=(<a Redis::Namespace>). be61b0f
Commits on Apr 20, 2011
GitHub Merge Button Merged pull request #267. bf84441
Commits on Apr 25, 2011
@defunkt defunkt Merged pull request #269 from toddthomas/fix_assigning_redis_namespace.
Add test for Resque.redis=(<a Redis::Namespace>).
@defunkt defunkt Merged pull request #265 from ono/master.
Show correct relative times to viewers in different timezone
@defunkt defunkt Merged pull request #266 from jlecour/master.
Typo in the Monit example
@defunkt defunkt Merged pull request #261 from Adman65/master.
Order matters for Hoptoad API
Commits on May 05, 2011
@will will move @paused into a #paused? method 4a13ceb
Commits on May 06, 2011
@raykrueger raykrueger Fixing/updating the hoptoad backend
The previous version of the hoptoad back end no longer worked. This is due to Hoptoad changing their API somewhere along the way.
I've updated the code here to simply use the hoptoad_notifier gem that folks are likely already using in their apps. This puts the
maintenance and configuration responsibility into that gem rather than here in resque.
Commits on May 11, 2011
Noah Davis Fix relative time display for failed jobs in Safari
Was displaying "NaN days ago" for relative time in Safari.

Safari cannot parse a date in the format '2010-05-10 16:24 -400',
but can parse '05/10/2010 16:24 -400'
@defunkt defunkt Merge pull request #276 from will/patch-1
move @paused into a #paused? method
@raykrueger raykrueger Add hoptoad_notifier dependency to the gemspec cd0f191
@raykrueger raykrueger Use notify_or_ignore for the hoptoad failure backend
Hoptoad can be configured with a set of exceptions to ignore. However, those exceptions are not
ignored when using Hoptoad.notify alone; Hoptoad.notify_or_ignore must be used.
@raykrueger raykrueger Add a test for the hoptoad failure backend
This class did not have a test previously, it's about time it got one.
Commits on May 16, 2011
@defunkt defunkt Merge pull request #277 from raykrueger/hoptoad_notifier
Fixing/updating the hoptoad backend by using hoptoad_notifier
@defunkt defunkt Merge pull request #247 from backupify/fix_resque_web_race_condition
Fix resque web race condition
@defunkt defunkt Merge pull request #282 from noahd1/fix_safari_relative_time
Fix relative time display for failed jobs in Safari
@defunkt defunkt redis= wants a string, redis object, or redis::namespace object 24eab54
@seamusabshere seamusabshere Properly reseed random number generator after forking. 0200c76
@nengxu nengxu Move resque/tasks to resque/lib to comply with new Rails convention a…
…nd get rid of the deprecation warning.
@defunkt defunkt Merge pull request #246 from lucasmundim/master
Fix polling from /workers/all in resque-web
@defunkt defunkt a word about Resque.push 13fa261
@defunkt defunkt favicon! thanks @gresrun ff8ffba
@defunkt defunkt depend on json >= 1.4.6, < 1.6 7539594
@defunkt defunkt ensure we're using bundler's test env 7b28202
@defunkt defunkt add leftright to test env for 1.8 only 008f905
@defunkt defunkt FAQ 8d23a30
@defunkt defunkt Highlight Ruby in the README f56fa99
@defunkt defunkt Hoptoad backend has always been optional - don't require hoptoad_noti…
…fier gem
@defunkt defunkt want newest redis-namespace bb6ba7d
@defunkt defunkt 1.16.0 f2bdb64
@defunkt defunkt aaaand Gemfile.lock 2327902
@morgoth morgoth added Gemfile.lock to gitignore 93f9df2
@morgoth morgoth fixed loading rake tasks 8e092ed
Commits on May 17, 2011
@defunkt defunkt Merge pull request #290 from morgoth/remove-gemfile-lock
added Gemfile.lock to gitignore
@defunkt defunkt Merge pull request #292 from morgoth/fixed-rake-tasks
fixed loading rake tasks
@defunkt defunkt return of Resque::Failure::Hoptoad.configure 5144168
@defunkt defunkt v1.16.1 0106734
Commits on May 19, 2011
Noah Davis use a date format that is both browser friendly and international fri…

previous date formats was parsable (by Safari) but not internationally friendly.
@defunkt defunkt Merge pull request #297 from noahd1/more_international_friendly_date_…

make date format more internationally friendly
Commits on May 26, 2011
@dpiddy dpiddy Add rake the Gemfile's test group. ada41b8
@dpiddy dpiddy Change worker exit to use `exit` instead of `exit!`.
`exit!` causes any `at_exit` hooks used by performed code to be ignored.
Brad Cantin fixed a typo in resque/examples/monit/resque.monit 265f03d
@defunkt defunkt Merge pull request #308 from bcantin/master
Typo in resque.monit
@defunkt defunkt Hoptoad.configure wants a block. Fixes #304 8e7c205
@defunkt defunkt Merge pull request #307 from dpiddy/master
Change worker child exit to use `exit` instead of `exit!`
@defunkt defunkt Fix monit example: needs /bin/sh to be a login shell 72f2792
@defunkt defunkt Changing preformatted arguments to wrap since it's hard to debug with…
…out wrapping on large arguments
@defunkt defunkt 1.17.0 ee5784c
Commits on May 27, 2011
@defunkt defunkt Revert "Change worker exit to use `exit` instead of `exit!`."
This reverts commit f3bbf99.

Every job is failing with a DirtyExit when the bang is removed.
@defunkt defunkt 1.17.1 e2d5804
Commits on May 28, 2011
@defunkt defunkt New screenshot in README (with transparent bg) 167e6fd
@defunkt defunkt Even better screenshot in README 157926e
Commits on Jun 04, 2011
mpd Update Resque.redis_id so resque-web can handle being used in a distr…
…ibuted ring.
Commits on Jun 05, 2011
@defunkt defunkt Merge pull request #313 from stipple/distributed
Update Resque.redis_id so resque-web can handle being used in a distributed ring
Commits on Jun 08, 2011
mpd Update Worker.working to handle being used in a distributed ring.
Update test suite to run either with a single server or distributed (RESQUE_DISTRIBUTED=1 rake test to run distributed)

Make sure all tests pass when running both single server and distributed.
Commits on Jun 25, 2011
@jadeforrest jadeforrest Added w.dir to set the current directory. 0a39370
@zr40 zr40 Shorten the backtrace logged by Resque::Failure::Redis to only includ…
…e the job by removing Resque and its callers (like Rake) from the backtrace.
@joshk joshk instead of using the json gem, or trying to require yajl, lets use mu…
…lti json which takes care of this for us and includes a vendored json implementation if one is not available
Commits on Jul 14, 2011
@defunkt defunkt bundle install 7f4c79a
@flori flori Fix bug causing working to always return the max
Apparently value isn't (always?) nil, but an empty hash, if the worker
isn't working.
@mrduncan mrduncan Adding install instructions for Rails 3 1f1ff49
@defunkt defunkt fix failure introduced by d1cfe4d 7b1ceea
@defunkt defunkt fix failure introduced by 285fef5 40f8b45
@jhuckabee jhuckabee Added a before_enqueue hook. aa24424
@defunkt defunkt Revert "fix failure introduced by 285fef5"
This reverts commit 40f8b45.
@defunkt defunkt use yajl and json in test group bdf4f5f
@defunkt defunkt OkJson won't work, raise if it's in use. d85097d
Commits on Jul 18, 2011
mpd Merge branch 'defunkt' into distributed
Commits on Jul 19, 2011
@steverandy steverandy Add Cache-Control header so proxy cache won't cache the pages. a55973a
@beilabs beilabs Killing resque workers using monit & establishing environments so mon…
…it can work with bundler
John Andrews + Andrew Grieser Fix issue with finding worker pids on jruby
- Old pattern returned empty array of worker pids on jruby
Commits on Jul 21, 2011
@defunkt defunkt Revert "Fix issue with finding worker pids on jruby"
This reverts commit 9b4b900.
Commits on Jul 26, 2011
mpd Merge branch 'defunkt' into distributed b8549ed
Commits on Aug 02, 2011
@EugZol EugZol fixed typo in docs/ cc135c8
Commits on Aug 11, 2011
@humancopy humancopy Format time for workers to fix NaN days in web-ui 4fc8d47
@humancopy humancopy Add the timezone to strftime 298a7f5
Commits on Aug 17, 2011
@defunkt defunkt Merge pull request #348 from humancopy/master
Fix NaN days ago for worker screens in web-ui
mpd Merge branch 'defunkt' into distributed 65780fc
Commits on Aug 18, 2011
Dan Hawker Add solaris_worker_pids 8c9be28
@defunkt defunkt Attempt to preload files under app/ when using Rails fedbe17
@defunkt defunkt v1.18.0 7e4e0ef
Commits on Aug 19, 2011
@defunkt defunkt Use RAILS_ROOT in preload task cb371b4
@defunkt defunkt 1.18.1 06bf675
Chris Harper Add travis yaml file 28c9f6a
Chris Harper Add Rubinius support 7efe552
Chris Harper Add Jruby
Include json with rbx
@defunkt defunkt grep [t]hing means you dont need grep -v grep 2cbc85a
@defunkt defunkt RAILS_ROOT is deprecated cbb400b
@defunkt defunkt 1.18.2 f0f1694
Commits on Aug 22, 2011
mpd Merge branch 'defunkt' into distributed 6caf6b6
Commits on Aug 23, 2011
@willywg willywg Fix: Preload app files on Rails 3.x. See: http://guides.rubyonrails.o… 45f9d16
@defunkt defunkt 1.18.3 6130fc2
@defunkt defunkt Revert "Fix: Preload app files on Rails 3.x. See: http://guides.rubyo… 6d03ab5
@defunkt defunkt preload task now depends on setup task 4c75ef2
@defunkt defunkt 1.18.4 78273c2
Commits on Aug 24, 2011
@cleishm cleishm Daemonizes when BACKGROUND environment var is set 60b157d
@cleishm cleishm Added documentation of daemonization 39d51cb
@cleishm cleishm Add a notes regarding ruby >= 1.9 requirement for BACKGROUND dcfbe36
@defunkt defunkt Merge pull request #356 from chrisharper/add_travis_support
Add travis support
@defunkt defunkt Only preload Rails app/ dir in production e35bbab
@defunkt defunkt 1.18.5 5328e6c
Commits on Aug 27, 2011
@daz daz Show focus outline in resque server 808c6ef
Commits on Aug 28, 2011
mpd Merge branch 'defunkt' into distributed 22d1fe1
Commits on Aug 29, 2011
@manuelmeurer manuelmeurer Fixed typo 184b387
@manuelmeurer manuelmeurer Added comment on how to mount the Resque frontend in an existing Rail…
…s 3 app
Commits on Aug 30, 2011
@defunkt defunkt Use Rails eager loading for resque:preload b6b19f5
@defunkt defunkt Fix incorrect load path in Resque rake task 5616192
@defunkt defunkt 1.18.6 e01bece
Commits on Sep 01, 2011
@defunkt defunkt Merge pull request #373 from daz/patch-1
Show focus outline in resque server
Commits on Sep 02, 2011
@ersatzryan ersatzryan Adds hoptoad_notifier and airbrake to Gemfile. Airbrake's dependencie…
…s are not defined correctly so we also have to add the i18n to the Gemfile.
@ersatzryan ersatzryan Adds Airbrake support while continuing backwards compatibility for Ho…
…ptoad. Adds tests for Airbrake.
@matth matth Add retry all button to failed jobs page in web UI 0c00ad8
@defunkt defunkt 1.19.0 192d347
Commits on Sep 09, 2011
@raykrueger raykrueger Make Resque.enqueue return something deterministic
Currently Resque.enqueue returns an empty [] or the results of the
after_enqueue_hooks that may have been run. If the before_enqueue_hook rejected
the operation we get back a nil.

This commit simply changes enqueue to return nil on rejection and true if the
job is actually queued.
Commits on Sep 16, 2011
@jhuckabee jhuckabee Make worker use global Resque.reserve method to allow for a single po…
…int of override.
Commits on Sep 17, 2011
@raykrueger raykrueger Notify jobs when they're killed due to DirtyExit
This will lead to being able to cleanup locks in the resque-lock plugin :)
@raykrueger raykrueger Merge remote-tracking branch 'defunkt/master' into better_failure_hooks 40dcc85
Commits on Sep 20, 2011
@humancopy humancopy Add before & after dequeue hooks. 5042244
@humancopy humancopy Fix tests. d42e322
Commits on Sep 22, 2011
mpd Merge branch 'defunkt' into distributed 8996224
@eric eric Set the height and width of icon img
This reduces the amount of flicker on polling.
@raykrueger raykrueger Remove unused job variable 5fee4cd
@raykrueger raykrueger Add docs to Resque.enque regarding return value ca2e8ac
@raykrueger raykrueger Added a note about on_failure hooks to doc
The on_failure hook is already documented. I simply added a note that the
Reque::DirtyExit exception is also passed to the hook now.
@defunkt defunkt Merge remote-tracking branch 'raykrueger/better_failure_hooks' b3cdd32
@defunkt defunkt Merge remote-tracking branch 'stipple/distributed' 8b15ac3
John Andrews + Andrew Grieser Work around JRuby shell escaping bug, fix finding worker pids on JRuby 5bc1086
@elubow elubow Web UI: Set the default encoding to UTF-8 560450e
@dan-g dan-g Added `Resque.enqueue_to`. Allows you to specify the queue and still …
…run hooks.
Jeshua Borges added Resque.enqueue_with_queue spec 57bb576
@defunkt defunkt tweak 4d530b8
Commits on Sep 23, 2011
@gjastrab gjastrab Adds -r flag to resque-web for redis connection
-r or --redis can now be used to specify the
redis connection string.

TODO: A string like redis://:secret@localhost is encountering an
error, even though it works in irb doing:

irb> require 'redis'
irb> r = Redis.connect(:url => "redis://:secret@localhost")
 => #<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis
@subelsky subelsky Add comment to clarify that resque/server must be required at the top…
… of the Rails routes file. If you don't do this, you get an uninitialized constant error.
@evanwhalen evanwhalen requeue and remove failed jobs by queue name ad8c332
@evanwhalen evanwhalen add docs 05b579b
@defunkt defunkt Merge remote-tracking branch 'chrisleishman/daemonize' 8d92f03
@humancopy humancopy Docs for before & after dequeue hooks. 17ad7f8
@defunkt defunkt Reading the 'Contributing' wiki page is now required. 461351c
@defunkt defunkt Merge pull request #398 from humancopy/resque

Before & after hooks for dequeue.

Needed this to resolve deadlocks with resque-lock when dequeuing a job (see: humancopy/resque-lock@740f1ab).

Thanks. ;)
Commits on Oct 10, 2011
@rtlong rtlong Fix Resque::Helpers#constantize to work correctly on 1.9.2 aca9e2f
@hone hone fix build for 1.9.2 4499a39
Commits on Oct 21, 2011
@quirkey quirkey Assign the job's worker before calling `before_fork`
Useful for inspecting the jobs woker in the hook
@defunkt defunkt Use Sinatra's public_folder if it exists
Fixes #421. Fixes #420.
@jeznet jeznet Mentioned and explained the INTERVAL option in the README. 50fee9b
Trevor Hart raise takes a string when re-raising as a different exception class. 76ebca1
@NielsIA NielsIA Fixed typo in demo README 0dc6974
@Jacobkg Jacobkg Wait for child with specific PID to avoid waiting on other zombie pro…
…cesses (e.g. NewRelic RPM) which may have forked earlier.
@tapajos tapajos Allow `*` to appear anywhere in queue list.
Fixes #405
Fixes #407
Commits on Oct 26, 2011
@federomero federomero Add ' to "require resque/server" in README.markdown eb999e5
Commits on Nov 08, 2011
Elise Huard allow trailing slashes at the end of all pages 8031b71
@defunkt defunkt Merge pull request #449 from elisehuard/master
trailing slashes at the end of resque servers' URLs
Commits on Feb 02, 2012
@hone hone payload class is a string not a ruby constant
Fixes #500
Commits on Feb 07, 2012
@hone hone Merge pull request #437 from federomero/patch-1
Add ' to "require resque/server" in README.markdown
Brian Morearty Add current directory to LOAD_PATH in demo for Ruby 1.9. 91c230a
Commits on Feb 09, 2012
@hone hone fix rbx testing on travis 9b2125a
@hone hone let's test on ruby 1.9.3 eef1125
@hone hone test in both 1.8 and 1.9 mode of jruby 8aad2e1
Commits on Feb 17, 2012
@hone hone add myself to gem author list c76e26a
@hone hone Version 1.20.0 96bb1b2
Commits on Feb 28, 2012
@tenderlove tenderlove removing leftright, simplify test task 85167a6
@tenderlove tenderlove simplify reader and predicate method 5949eb3
@tenderlove tenderlove removing bundler and eliminating some test warnings 9624a63
@hone hone Merge pull request #520 from tenderlove/warnings
removing bundler and eliminating some test warnings
@hone hone Merge pull request #521 from tenderlove/simplify
simplify reader and predicate method
@hone hone Merge pull request #522 from tenderlove/testing
removing leftright, simplify test task
@tenderlove tenderlove using attr_writer rather than defining our own writers 25d11d8
@hone hone Merge pull request #523 from tenderlove/writer
using attr_writer rather than defining our own writers
@tenderlove tenderlove stop using global variables, eliminate warnings, reset monkey patch s…
…o that test time is correct
@hone hone Merge pull request #524 from tenderlove/mocking
eliminate global vars, warnings, and fix test time