logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 0f852c6f749dcee61758c4c5ccd94be98f29512c
parent: 974ac467de5a60a30dc3d19b8ced732e04395879
Author: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date:   Sat, 22 Apr 2017 08:22:20 +0900

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

Setting port after binding a unix socket puma listen to both of an unix
socket and TCP/IP, which is not a desired behavior.

Diffstat:

Mconfig/puma.rb3++-
1 file changed, 2 insertions(+), 1 deletion(-)

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