Skip to content

Commit 429ace6

Browse files
quirkeydefunkt
authored andcommitted
Fix issue where resque-web was not correctly eval'ing config [Closes resque#25]
Requires an upgrade of the vegas gem.
1 parent eb89a34 commit 429ace6

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ begin
4040

4141
gemspec.add_dependency "redis"
4242
gemspec.add_dependency "redis-namespace"
43-
gemspec.add_dependency "vegas", ">=0.1.1"
43+
gemspec.add_dependency "vegas", ">=0.1.2"
4444
gemspec.add_dependency "sinatra", ">=0.9.2"
4545
gemspec.add_development_dependency "jeweler"
4646
end

bin/resque-web

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
#!/usr/bin/env ruby
22

33
$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
4+
require 'rubygems'
45
require 'vegas'
56
require 'resque/server'
67

78

89
Vegas::Runner.new(Resque::Server, 'resque-web', {
9-
:resque_config => lambda {|v|
10+
:before_run => lambda {|v|
1011
path = (ENV['RESQUECONFIG'] || v.args.first).strip
11-
if path && path != '' && path = File.expand_path(path)
12-
if File.file?(path)
13-
load path
14-
else
15-
abort "** Can't find #{path}"
16-
end
17-
end
18-
path
12+
v.load_config_file(path) if path
1913
}
2014
})

deps.rip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ git://github.com/ezmobius/redis-rb.git eed200ad
22
git://github.com/brianmario/yajl-ruby.git 0.6.3
33
git://github.com/sinatra/sinatra.git 0.9.4
44
git://github.com/rack/rack.git 1.0
5-
git://github.com/quirkey/vegas.git v0.1.1
5+
git://github.com/quirkey/vegas.git v0.1.2
66
rake

0 commit comments

Comments
 (0)