Skip to content

Add option to deploy listeners using Falcon #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidor merged 3 commits into from
Jan 23, 2020
Merged

Add option to deploy listeners using Falcon #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
309d757
Gemfiles: add falcon
davidor Jan 13, 2020
a11710d
server: add Falcon
davidor Jan 13, 2020
1dd6d14
manifest: decide workers based on LISTENER_WORKERS
davidor Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,4 @@ gem 'bugsnag', '~> 6', require: nil
gem 'prometheus-client'
gem 'yabeda-prometheus', '= 0.1.4'
gem 'async-redis', '~> 0.4.1'
gem 'falcon', '~> 0.34'
Copy link
Copy Markdown
Contributor

@andrewdavidmackenzie andrewdavidmackenzie Jan 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

License of Falcon as a new dependency is OK?
Passes our license_checker?

Copy link
Copy Markdown
Contributor Author

@davidor davidor Jan 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's MIT.

47 changes: 44 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,25 @@ GEM
airbrake (4.3.1)
builder
multi_json
async (1.22.0)
async (1.24.1)
console (~> 1.0)
nio4r (~> 2.3)
timers (~> 4.1)
async-io (1.25.0)
async-container (0.14.1)
async (~> 1.0)
async-io (~> 1.4)
process-group
async-http (0.50.0)
async (~> 1.23)
async-io (~> 1.27.0)
async-pool (~> 0.2)
protocol-http (~> 0.13.0)
protocol-http1 (~> 0.10.0)
protocol-http2 (~> 0.10.0)
async-io (1.27.1)
async (~> 1.14)
async-pool (0.2.0)
async (~> 1.8)
async-redis (0.4.1)
async (~> 1.8)
async-io (~> 1.10)
Expand All @@ -65,20 +78,31 @@ GEM
benchmark-ips (2.7.2)
bugsnag (6.6.4)
concurrent-ruby (~> 1.0)
build-environment (1.12.1)
builder (3.2.3)
byebug (9.1.0)
chronic (0.10.2)
codeclimate-test-reporter (0.6.0)
simplecov (>= 0.7.1, < 1.0.0)
coderay (1.1.2)
concurrent-ruby (1.0.5)
console (1.4.0)
console (1.7.0)
daemons (1.2.4)
diff-lcs (1.3)
docile (1.1.5)
dry-initializer (3.0.1)
falcon (0.34.5)
async (~> 1.13)
async-container (~> 0.14.0)
async-http (~> 0.50.0)
async-io (~> 1.22)
build-environment (~> 1.11)
localhost (~> 1.1)
rack (>= 1.0)
samovar (~> 2.1)
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
ffi (1.11.3)
geminabox (0.13.11)
builder
faraday
Expand All @@ -100,6 +124,8 @@ GEM
toml (= 0.2.0)
with_env (= 1.1.0)
xml-simple
localhost (1.1.6)
mapping (1.1.1)
metaclass (0.0.4)
method_source (0.9.0)
mini_portile2 (2.4.0)
Expand All @@ -122,8 +148,19 @@ GEM
pg (0.20.0)
pkg-config (1.1.9)
power_assert (1.1.1)
process-group (1.2.1)
process-terminal (~> 0.2.0)
process-terminal (0.2.0)
ffi
prometheus-client (0.9.0)
quantile (~> 0.2.1)
protocol-hpack (1.4.1)
protocol-http (0.13.0)
protocol-http1 (0.10.0)
protocol-http (~> 0.13)
protocol-http2 (0.10.4)
protocol-hpack (~> 1.4)
protocol-http (~> 0.2)
protocol-redis (0.2.0)
pry (0.11.3)
coderay (~> 1.1.0)
Expand Down Expand Up @@ -174,6 +211,9 @@ GEM
mustache (~> 1.0, >= 0.99.4)
rspec (~> 3.0)
rubyzip (2.0.0)
samovar (2.1.2)
console (~> 1.0)
mapping (~> 1.0)
scientist (1.0.0)
simplecov (0.15.1)
docile (~> 1.1.0)
Expand Down Expand Up @@ -236,6 +276,7 @@ DEPENDENCIES
builder (= 3.2.3)
codeclimate-test-reporter (~> 0.6.0)
daemons (= 1.2.4)
falcon (~> 0.34)
geminabox (~> 0.13.11)
gli (~> 2.16.1)
hiredis (= 0.6.1)
Expand Down
38 changes: 38 additions & 0 deletions Gemfile.on_prem.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,16 @@ GEM
console (~> 1.0)
nio4r (~> 2.3)
timers (~> 4.1)
async-container (0.14.1)
async (~> 1.0)
async-io (~> 1.4)
process-group
async-http (0.48.2)
async (~> 1.19)
async-io (~> 1.25)
protocol-http (~> 0.12.0)
protocol-http1 (~> 0.9.0)
protocol-http2 (~> 0.9.0)
async-io (1.25.0)
async (~> 1.14)
async-redis (0.4.1)
Expand All @@ -56,6 +66,7 @@ GEM
benchmark-ips (2.7.2)
bugsnag (6.6.4)
concurrent-ruby (~> 1.0)
build-environment (1.12.1)
builder (3.2.3)
byebug (9.1.0)
codeclimate-test-reporter (0.6.0)
Expand All @@ -67,8 +78,18 @@ GEM
diff-lcs (1.3)
docile (1.1.5)
dry-initializer (3.0.1)
falcon (0.34.3)
async (~> 1.13)
async-container (~> 0.14.0)
async-http (~> 0.48.0)
async-io (~> 1.22)
build-environment (~> 1.11)
localhost (~> 1.1)
rack (>= 1.0)
samovar (~> 2.1)
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
ffi (1.11.3)
geminabox (0.13.11)
builder
faraday
Expand All @@ -89,6 +110,8 @@ GEM
toml (= 0.2.0)
with_env (= 1.1.0)
xml-simple
localhost (1.1.6)
mapping (1.1.1)
metaclass (0.0.4)
method_source (0.9.0)
mini_portile2 (2.4.0)
Expand All @@ -110,8 +133,19 @@ GEM
parslet (1.8.2)
pkg-config (1.1.9)
power_assert (1.1.1)
process-group (1.2.1)
process-terminal (~> 0.2.0)
process-terminal (0.2.0)
ffi
prometheus-client (0.9.0)
quantile (~> 0.2.1)
protocol-hpack (1.4.1)
protocol-http (0.12.3)
protocol-http1 (0.9.0)
protocol-http (~> 0.5)
protocol-http2 (0.9.7)
protocol-hpack (~> 1.4)
protocol-http (~> 0.2)
protocol-redis (0.2.0)
pry (0.11.3)
coderay (~> 1.1.0)
Expand Down Expand Up @@ -162,6 +196,9 @@ GEM
mustache (~> 1.0, >= 0.99.4)
rspec (~> 3.0)
rubyzip (2.0.0)
samovar (2.1.2)
console (~> 1.0)
mapping (~> 1.0)
simplecov (0.15.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
Expand Down Expand Up @@ -218,6 +255,7 @@ DEPENDENCIES
builder (= 3.2.3)
codeclimate-test-reporter (~> 0.6.0)
daemons (= 1.2.4)
falcon (~> 0.34)
Comment thread
davidor marked this conversation as resolved.
geminabox (~> 0.13.11)
gli (~> 2.16.1)
hiredis (= 0.6.1)
Expand Down
30 changes: 20 additions & 10 deletions lib/3scale/backend/manifest.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ module ThreeScale
module Backend
module Manifest
class << self
LISTENER_WORKERS = 'LISTENER_WORKERS'.freeze
private_constant :LISTENER_WORKERS
PUMA_WORKERS = 'PUMA_WORKERS'.freeze
private_constant :PUMA_WORKERS
PUMA_WORKERS_CPUMULT = 8
Expand All @@ -16,19 +18,15 @@ def thread_safe?
false
end

# Compute workers based on PUMA_WORKERS env variable
# If PUMA_WORKERS does not exist or is empty, use number of cpus
# Compute workers based on LISTENER_WORKERS and PUMA_WORKERS env
# variables. The former takes precedence.
# If those envs do not exist or are empty, use number of cpus
def compute_workers(ncpus)
return 0 unless Process.respond_to?(:fork)
if ENV[PUMA_WORKERS] && !ENV[PUMA_WORKERS].empty?
begin
Integer(ENV[PUMA_WORKERS])
rescue => e
raise e, "PUMA_WORKERS environment var cannot be parsed: #{e.message}"
end
else

compute_workers_from_env(LISTENER_WORKERS) ||
compute_workers_from_env(PUMA_WORKERS) ||
ncpus * PUMA_WORKERS_CPUMULT
end
end

def server_model
Expand Down Expand Up @@ -64,6 +62,18 @@ def report
server_model: server_model,
}
end

private

def compute_workers_from_env(env_name)
if ENV[env_name] && !ENV[env_name].empty?
begin
Integer(ENV[env_name])
rescue => e
raise e, "#{env_name} environment var cannot be parsed: #{e.message}"
end
end
end
end
end
end
Expand Down
48 changes: 48 additions & 0 deletions lib/3scale/backend/server/falcon.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
module ThreeScale
module Backend
module Server
class Falcon
extend ThreeScale::Backend::Server::Utils

def self.start(global_options, options, args)
# Falcon does not support:
# - options[:daemonize]
# - options[:logfile]
# - options[:errorfile]
# - options[:pidfile]
Comment thread
davidor marked this conversation as resolved.

manifest = global_options[:manifest]
return unless manifest

argv = ['falcon']
argv_add argv, true, '--bind', 'http://0.0.0.0'
argv_add argv, options[:port], '--port', options[:port]

server_model = manifest[:server_model]
argv_add argv, true, '--count', server_model[:workers].to_s
end

def self.restart(global_options, options, args)
argv = ['falcon', 'supervisor']
argv_add argv, true, 'restart'
end

def self.stop(global_options, options, args)
STDERR.puts 'Not implemented'
end

def self.status(global_options, options, args)
STDERR.puts 'Not implemented'
end

def self.stats(global_options, options, args)
STDERR.puts 'Not implemented'
end

def self.help(global_options, options, args)
system('falcon --help')
end
end
end
end
end