Skip to content

Commit 471e17d

Browse files
authored
Use tcp on port 3000 for puma when nginx socket is empty (#3939)
1 parent fd3022d commit 471e17d

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

lib/cloud_controller/runners/puma_runner.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ def initialize(config, app, logger, periodic_updater, request_logs)
1010

1111
puma_config = Puma::Configuration.new do |conf|
1212
if config.get(:nginx, :use_nginx)
13-
conf.bind "unix://#{config.get(:nginx, :instance_socket)}"
13+
if config.get(:nginx, :instance_socket).nil? || config.get(:nginx, :instance_socket).empty?
14+
conf.bind 'tcp://0.0.0.0:3000'
15+
else
16+
conf.bind "unix://#{config.get(:nginx, :instance_socket)}"
17+
end
1418
else
1519
conf.bind "tcp://0.0.0.0:#{config.get(:external_port)}"
1620
end

spec/unit/lib/cloud_controller/runners/puma_runner_spec.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@ module VCAP::CloudController
4949
expect(puma_launcher.config.final_options[:binds].first).to eq("unix://#{socket}")
5050
end
5151

52+
context 'when socket is not configured' do
53+
let(:socket) { '' }
54+
55+
it 'binds to the nginx default port 3000' do
56+
subject
57+
expect(puma_launcher.config.final_options[:binds].first).to eq('tcp://0.0.0.0:3000')
58+
end
59+
end
60+
5261
context 'when not using nginx' do
5362
let(:use_nginx) { false }
5463

0 commit comments

Comments
 (0)