Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix issue where resque-web was not correctly eval'ing config [Closes #25

]

Requires an upgrade of the vegas gem.
  • Loading branch information...
commit 429ace61b514d1c2d4ae992b68530db30af28716 1 parent eb89a34
@quirkey quirkey authored defunkt committed
Showing with 5 additions and 11 deletions.
  1. +1 −1  Rakefile
  2. +3 −9 bin/resque-web
  3. +1 −1  deps.rip
View
2  Rakefile
@@ -40,7 +40,7 @@ begin
gemspec.add_dependency "redis"
gemspec.add_dependency "redis-namespace"
- gemspec.add_dependency "vegas", ">=0.1.1"
+ gemspec.add_dependency "vegas", ">=0.1.2"
gemspec.add_dependency "sinatra", ">=0.9.2"
gemspec.add_development_dependency "jeweler"
end
View
12 bin/resque-web
@@ -1,20 +1,14 @@
#!/usr/bin/env ruby
$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'rubygems'
require 'vegas'
require 'resque/server'
Vegas::Runner.new(Resque::Server, 'resque-web', {
- :resque_config => lambda {|v|
+ :before_run => lambda {|v|
path = (ENV['RESQUECONFIG'] || v.args.first).strip
- if path && path != '' && path = File.expand_path(path)
- if File.file?(path)
- load path
- else
- abort "** Can't find #{path}"
- end
- end
- path
+ v.load_config_file(path) if path
}
})
View
2  deps.rip
@@ -2,5 +2,5 @@ git://github.com/ezmobius/redis-rb.git eed200ad
git://github.com/brianmario/yajl-ruby.git 0.6.3
git://github.com/sinatra/sinatra.git 0.9.4
git://github.com/rack/rack.git 1.0
-git://github.com/quirkey/vegas.git v0.1.1
+git://github.com/quirkey/vegas.git v0.1.2
rake
Please sign in to comment.
Something went wrong with that request. Please try again.