mirror of
https://github.com/mperham/sidekiq.git
synced 2022-11-09 13:52:34 -05:00
Fix default tag with capistrano release directories
This commit is contained in:
parent
b8d0c5209c
commit
7555a38fb4
1 changed files with 12 additions and 1 deletions
|
@ -126,12 +126,23 @@ module Sidekiq
|
||||||
require 'sidekiq/rails'
|
require 'sidekiq/rails'
|
||||||
require File.expand_path("#{options[:require]}/config/environment.rb")
|
require File.expand_path("#{options[:require]}/config/environment.rb")
|
||||||
::Rails.application.eager_load!
|
::Rails.application.eager_load!
|
||||||
options[:tag] ||= File.basename(::Rails.root)
|
options[:tag] ||= default_tag
|
||||||
else
|
else
|
||||||
require options[:require]
|
require options[:require]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def default_tag
|
||||||
|
dir = ::Rails.root
|
||||||
|
name = File.basename(dir)
|
||||||
|
if name.to_i != 0 && prevdir = File.dirname(dir) # Capistrano release directory?
|
||||||
|
if File.basename(prevdir) == 'releases'
|
||||||
|
return File.basename(File.dirname(prevdir))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
name
|
||||||
|
end
|
||||||
|
|
||||||
def validate!
|
def validate!
|
||||||
options[:queues] << 'default' if options[:queues].empty?
|
options[:queues] << 'default' if options[:queues].empty?
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue