Skip to content
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.

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

Load JSON at runtime #2269

Merged
merged 2 commits into from Aug 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions History.md
Expand Up @@ -34,6 +34,7 @@
* Log binding on http:// for TCP bindings to make it clickable

* Bugfixes
* Fix JSON loading issues on phased-restarts (#2269)
* Improve shutdown reliability (#2312, #2338)
* Close client http connections made to an ssl server with TLSv1.3 (#2116)
* Do not set user_config to quiet by default to allow for file config (#2074)
Expand Down
1 change: 1 addition & 0 deletions lib/puma.rb
Expand Up @@ -20,6 +20,7 @@ def self.stats_object=(val)
end

def self.stats
require 'json'
@get_stats.stats.to_json
end

Expand Down
6 changes: 4 additions & 2 deletions lib/puma/app/status.rb
@@ -1,7 +1,5 @@
# frozen_string_literal: true

require 'json'

module Puma
module App
# Check out {#call}'s source code to see what actions this web application
Expand All @@ -19,6 +17,10 @@ def call(env)
return rack_response(403, 'Invalid auth token', 'text/plain')
end

if env['PATH_INFO'] =~ /\/(gc-stats|stats|thread-backtraces)$/
require 'json'
end

case env['PATH_INFO']
when /\/stop$/
@cli.stop
Expand Down
3 changes: 2 additions & 1 deletion lib/puma/cluster.rb
Expand Up @@ -5,7 +5,6 @@
require 'puma/plugin'

require 'time'
require 'json'

module Puma
# This class is instantiated by the `Puma::Launcher` and used
Expand Down Expand Up @@ -95,6 +94,7 @@ def term?

def ping!(status)
@last_checkin = Time.now
require 'json'
@last_status = JSON.parse(status, symbolize_names: true)
end

Expand Down Expand Up @@ -333,6 +333,7 @@ def worker(index, master)
while true
sleep Const::WORKER_CHECK_INTERVAL
begin
require 'json'
io << "p#{Process.pid}#{server.stats.to_json}\n"
rescue IOError
Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
Expand Down