Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: dpiddy/resque
...
head fork: processone/resque
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jun 08, 2011
@xxx xxx 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.
d68e999
Commits on Jul 18, 2011
@xxx xxx Merge branch 'defunkt' into distributed
Conflicts:
	lib/resque/worker.rb
9016204
Commits on Jul 26, 2011
@xxx xxx Merge branch 'defunkt' into distributed b8549ed
Commits on Aug 02, 2011
@EugZol EugZol fixed typo in docs/HOOKS.md 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
e947af0
@xxx xxx 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
2783a43
@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
@xxx xxx 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
b48f614
@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
@xxx xxx 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
7976e93
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
ddfbd4a
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.
9beb796
@ersatzryan ersatzryan Adds Airbrake support while continuing backwards compatibility for Ho…
…ptoad. Adds tests for Airbrake.
2113127
@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.
1f7411d
Commits on Sep 16, 2011
@jhuckabee jhuckabee Make worker use global Resque.reserve method to allow for a single po…
…int of override.
11f3fac
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 :)
7113b0d
@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
@xxx xxx Merge branch 'defunkt' into distributed 8996224
@eric eric Set the height and width of icon img
This reduces the amount of flicker on polling.
cdd4a93
@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.
21ecfea
@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.
f2a1e12
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
 v2.2.12)>
df89630
@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.
87970a9
@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. ;)
c8a3e0a
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
56ad1e7
@defunkt defunkt Use Sinatra's public_folder if it exists
Fixes #421. Fixes #420.
3080af3
@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
Niels Johnson 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.
635b50c
@tapajos tapajos Allow `*` to appear anywhere in queue list.
Fixes #405
Fixes #407
7bc421a
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
af5a9a8
Commits on Feb 02, 2012
@hone hone payload class is a string not a ruby constant
Fixes #500
deea948
Commits on Feb 07, 2012
@hone hone Merge pull request #437 from federomero/patch-1
Add ' to "require resque/server" in README.markdown
ddfb5bb
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
e5deeed
@hone hone Merge pull request #521 from tenderlove/simplify
simplify reader and predicate method
ea78953
@hone hone Merge pull request #522 from tenderlove/testing
removing leftright, simplify test task
e4a2317
@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
864bdea
@tenderlove tenderlove stop using global variables, eliminate warnings, reset monkey patch s…
…o that test time is correct
66a8b8b
@hone hone Merge pull request #524 from tenderlove/mocking
eliminate global vars, warnings, and fix test time
4dbddcb