Skip to content

Commit

Permalink
Merge pull request sidekiq#2043 from seuros/conf_logger
Browse files Browse the repository at this point in the history
Tell @kenips if he is using a config.
  • Loading branch information
mperham committed Nov 5, 2014
2 parents 2dc08b4 + c5d9d3e commit 64bee3b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions Changes.md
Expand Up @@ -3,6 +3,7 @@ HEAD

- Fix typo for generator test file name [dlackty, #2016]
- Add Sidekiq::Middleware::Chain#prepend [seuros, #2029]
- Debug: Print the used config file

3.2.6
-----------
Expand Down
1 change: 1 addition & 0 deletions lib/sidekiq/cli.rb
Expand Up @@ -353,6 +353,7 @@ def write_pid
def parse_config(cfile)
opts = {}
if File.exist?(cfile)
logger.debug "Using config file: #{cfile}"
opts = YAML.load(ERB.new(IO.read(cfile)).result) || opts
opts = opts.merge(opts.delete(environment) || {})
parse_queues(opts, opts.delete(:queues) || [])
Expand Down

0 comments on commit 64bee3b

Please sign in to comment.