Fix resque-web config and library loading.

Author: defunkt

HISTORY.md

@@ -3,6 +3,8 @@
 * Added `rake resque:workers` task for starting multiple workers.
 * 1.9.x compatibility
 * Bugfix: Yajl decoder doesn't care about valid UTF-8
+* config.ru loads RESQUECONFIG if the ENV variable is set.
+* `resque-web` now sets RESQUECONFIG
 
 ## 1.2.0 (2009-11-25)
 

bin/resque-web

@@ -30,18 +30,15 @@ Common options:
       --version            Show version
 usage
 else
-  if !ENV['CONFIG']&&ARGV[-1]&&ARGV[-1][0]!=?-&&(ARGV[-2]?ARGV[-2][0]!=?-:true)
+  if !ENV['RESQUECONFIG']&&ARGV[-1]&&ARGV[-1][0]!=?-&&(ARGV[-2]?ARGV[-2][0]!=?-:true)
     if File.file?(file = File.expand_path(ARGV[-1]))
       ARGV.delete_at(-1)
-      ENV['CONFIG'] = file
+      ENV['RESQUECONFIG'] = file
     else
       abort "** Can't find #{file}"
     end
   end
 
-  args = ARGV
-  ENV['RUBYLIB'] = ENV['RUBYLIB'].to_s + ':' + __DIR__ + '/../lib'
-  args.unshift '-e', 'require "resque";load ENV["CONFIG"] if ENV["CONFIG"]'
-  args.push File.expand_path(File.dirname(__FILE__) + "/../config.ru")
-  exec "rackup", *args
+  ARGV.push File.expand_path(File.dirname(__FILE__) + "/../config.ru")
+  exec "rackup", *ARGV
 end

config.ru

@@ -4,5 +4,11 @@ require 'logger'
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/lib')
 require 'resque/server'
 
+# Set the RESQUECONFIG env variable if you've a `resque.rb` or similar
+# config file you want loaded on boot.
+if ENV['RESQUECONFIG'] && File.exists?(File.expand_path(ENV['RESQUECONFIG']))
+  load File.expand_path(ENV['RESQUECONFIG'])
+end
+
 use Rack::ShowExceptions
 run Resque::Server.new