Skip to content

Commit

Permalink
Fix issue where resque-web was not correctly eval'ing config [Closes r…
Browse files Browse the repository at this point in the history
…esque#25]

Requires an upgrade of the vegas gem.
  • Loading branch information
quirkey authored and defunkt committed Dec 29, 2009
1 parent eb89a34 commit 429ace6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -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
Expand Down
12 changes: 3 additions & 9 deletions 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
}
})
2 changes: 1 addition & 1 deletion deps.rip
Expand Up @@ -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

0 comments on commit 429ace6

Please sign in to comment.