Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added missing #unicorn_socket to 'unicorn config exists', and renamed…

… the other socket helper to be the same.
  • Loading branch information...
commit a7b6a6bab375d275f1c01633d3b4e721f82a3eb6 1 parent 4872d53
Ben Hoskings authored
2  nginx.rb
View
@@ -12,7 +12,7 @@ def vhost_link; nginx_prefix / "conf/vhosts/on/#{domain}.conf" end
def upstream_name
"#{domain}.upstream"
end
- def unicorn_socket_path
+ def unicorn_socket
path / 'tmp/sockets/unicorn.socket'
end
def nginx_running?
2  nginx/vhost.conf.erb
View
@@ -3,7 +3,7 @@
upstream <%= upstream_name %> {
# fail_timeout=0 means we always retry an upstream even if it failed to return a good
# HTTP response (in case the Unicorn master nukes a single worker for timing out).
- server unix:<%= unicorn_socket_path %> fail_timeout=0;
+ server unix:<%= unicorn_socket %> fail_timeout=0;
}
<% end %>
3  unicorn.rb
View
@@ -10,6 +10,9 @@
def unicorn_config
path / 'config/unicorn.rb'
end
+ def unicorn_socket
+ path / 'tmp/sockets/unicorn.socket'
+ end
met? { unicorn_config.exists? }
meet { render_erb 'unicorn/unicorn.rb.erb', :to => unicorn_config }
end
2  unicorn/unicorn.rb.erb
View
@@ -4,7 +4,7 @@ working_directory '.'
preload_app true
timeout 60
-listen "<%= unicorn_socket_path %>", :backlog => 64
+listen "<%= unicorn_socket %>", :backlog => 64
pid "<%= path / 'tmp/pids/unicorn.pid' %>"
stderr_path "<%= path / 'log/unicorn.stderr.log' %>"
stdout_path "<%= path / 'log/unicorn.stdout.log' %>"
Please sign in to comment.
Something went wrong with that request. Please try again.