Skip to content
This repository was archived by the owner on May 14, 2021. It is now read-only.

Commit c26bc17

Browse files
committed
Revert "[COOK-3377] Add configurable wait time to runit scripts"
This reverts commit bb7d976.
1 parent 49969b3 commit c26bc17

3 files changed

Lines changed: 2 additions & 5 deletions

File tree

providers/unicorn.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@
8686
:bundler => new_resource.bundler,
8787
:bundle_command => new_resource.bundle_command,
8888
:rails_env => new_resource.environment_name,
89-
:smells_like_rack => ::File.exists?(::File.join(new_resource.path, "current", "config.ru")),
90-
:runit_wait_time => new_resource.runit_wait_time
89+
:smells_like_rack => ::File.exists?(::File.join(new_resource.path, "current", "config.ru"))
9190
)
9291
end
9392

resources/unicorn.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
attribute :unicorn_command_line, :kind_of => [String, NilClass], :default => nil
3939
attribute :copy_on_write, :kind_of => [TrueClass, FalseClass], :default => false
4040
attribute :enable_stats, :kind_of => [TrueClass, FalseClass], :default => false
41-
attribute :runit_wait_time, :kind_of => Integer, :default => 7
4241

4342
def options(*args, &block)
4443
@options ||= Mash[:tcp_nodelay => true, :backlog => 100]

templates/default/sv-unicorn-run.erb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ exec <%= node[:runit][:chpst_bin] %> \
88
<%= @options[:bundler] ? "#{@options[:bundle_command]} exec" : '' %> \
99
<%= @options[:smells_like_rack] ? 'unicorn' : 'unicorn_rails' %> \
1010
-E <%= @options[:rails_env] %> \
11-
-c /etc/unicorn/<%= @options[:app].application.name %>.rb \
12-
-w <%= @options[:runit_wait_time] %>
11+
-c /etc/unicorn/<%= @options[:app].application.name %>.rb

0 commit comments

Comments
 (0)