mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-21 20:15:10 +01:00
Code Issues Projects Releases Wiki Activity

Do not set port for puma if it is bound to unix socket (#2289)

Browse Source 
Setting port after binding a unix socket puma listen to both of an unix
socket and TCP/IP, which is not a desired behavior.
This commit is contained in:
Akihiko Odaki 2017-04-22 08:22:20 +09:00 committed by Eugen
parent 974ac467de
commit 0f852c6f74
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/puma.rb
View File

@ -3,9 +3,10 @@ threads threads_count, threads_count
if ENV['SOCKET'] then if ENV['SOCKET'] then
bind 'unix://' + ENV['SOCKET'] bind 'unix://' + ENV['SOCKET']
else
port ENV.fetch('PORT') { 3000 }
end end
port ENV.fetch('PORT') { 3000 }
environment ENV.fetch('RAILS_ENV') { 'development' } environment ENV.fetch('RAILS_ENV') { 'development' }
workers ENV.fetch('WEB_CONCURRENCY') { 2 } workers ENV.fetch('WEB_CONCURRENCY') { 2 }