mirror of
https://github.com/mperham/sidekiq.git
synced 2022-11-09 13:52:34 -05:00
Merge pull request #456 from pivotal-chelsea/erb_config
pass the yml file through erb first
This commit is contained in:
commit
5974b1106a
3 changed files with 4 additions and 3 deletions
|
@ -32,6 +32,7 @@ require 'yaml'
|
||||||
require 'singleton'
|
require 'singleton'
|
||||||
require 'optparse'
|
require 'optparse'
|
||||||
require 'celluloid'
|
require 'celluloid'
|
||||||
|
require 'erb'
|
||||||
|
|
||||||
require 'sidekiq'
|
require 'sidekiq'
|
||||||
require 'sidekiq/util'
|
require 'sidekiq/util'
|
||||||
|
@ -208,7 +209,7 @@ module Sidekiq
|
||||||
def parse_config(cli)
|
def parse_config(cli)
|
||||||
opts = {}
|
opts = {}
|
||||||
if cli[:config_file] && File.exist?(cli[:config_file])
|
if cli[:config_file] && File.exist?(cli[:config_file])
|
||||||
opts = YAML.load_file cli[:config_file]
|
opts = YAML.load(ERB.new(IO.read(cli[:config_file])).result)
|
||||||
queues = opts.delete(:queues) || []
|
queues = opts.delete(:queues) || []
|
||||||
queues.each { |name, weight| parse_queues(opts, name, weight) }
|
queues.each { |name, weight| parse_queues(opts, name, weight) }
|
||||||
end
|
end
|
||||||
|
|
|
@ -5,5 +5,5 @@
|
||||||
:pidfile: /tmp/sidekiq-config-test.pid
|
:pidfile: /tmp/sidekiq-config-test.pid
|
||||||
:concurrency: 50
|
:concurrency: 50
|
||||||
:queues:
|
:queues:
|
||||||
- [often, 2]
|
- [<%="very_"%>often, 2]
|
||||||
- [seldom, 1]
|
- [seldom, 1]
|
||||||
|
|
|
@ -135,7 +135,7 @@ class TestCli < MiniTest::Unit::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'sets queues' do
|
it 'sets queues' do
|
||||||
assert_equal 2, Sidekiq.options[:queues].count { |q| q == 'often' }
|
assert_equal 2, Sidekiq.options[:queues].count { |q| q == 'very_often' }
|
||||||
assert_equal 1, Sidekiq.options[:queues].count { |q| q == 'seldom' }
|
assert_equal 1, Sidekiq.options[:queues].count { |q| q == 'seldom' }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue