Skip to content

Commit

Permalink
Merge pull request seuros#61 from davidlesches/master
Browse files Browse the repository at this point in the history
Update Cap2 Defaults to include config file
  • Loading branch information
seuros committed Dec 17, 2014
2 parents 6d454f5 + ce681d1 commit d5c9c60
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions lib/capistrano/tasks/capistrano2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
_cset(:sidekiq_tag) { nil }
_cset(:sidekiq_log) { File.join(shared_path, 'log', 'sidekiq.log') }

_cset(:sidekiq_config) { "#{current_path}/config/sidekiq.yml" }
_cset(:sidekiq_options) { nil }

_cset(:sidekiq_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec sidekiq" }
Expand Down Expand Up @@ -50,6 +51,7 @@ def start_process(pid_file, idx)
args.push "--environment #{fetch(:sidekiq_env)}"
args.push "--tag #{fetch(:sidekiq_tag)}" if fetch(:sidekiq_tag)
args.push "--logfile #{fetch(:sidekiq_log)}" if fetch(:sidekiq_log)
args.push "--config #{fetch(:sidekiq_config)}" if fetch(:sidekiq_config)
fetch(:sidekiq_queue).each do |queue|
args.push "--queue #{queue}"
end if fetch(:sidekiq_queue)
Expand Down

0 comments on commit d5c9c60

Please sign in to comment.