1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00

Load JSON at runtime

Closes #2206
This commit is contained in:
MSP-Greg 2020-05-17 11:46:14 -05:00
parent 91e57f4e17
commit fe31aadd5b
4 changed files with 8 additions and 3 deletions

View file

@ -26,6 +26,7 @@
* Configuration: `environment` is read from `RAILS_ENV`, if `RACK_ENV` can't be found (#2022)
* Bugfixes
* Fix JSON loading issues on phased-restarts (#2269)
* 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)
* Always close SSL connection in Puma::ControlCLI (#2211)

View file

@ -20,6 +20,7 @@ module Puma
end
def self.stats
require 'json'
@get_stats.stats.to_json
end

View file

@ -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
@ -19,6 +17,10 @@ module Puma
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

View file

@ -5,7 +5,6 @@ require 'puma/util'
require 'puma/plugin'
require 'time'
require 'json'
module Puma
# This class is instantiated by the `Puma::Launcher` and used
@ -95,6 +94,7 @@ module Puma
def ping!(status)
@last_checkin = Time.now
require 'json'
@last_status = JSON.parse(status, symbolize_names: true)
end
@ -330,6 +330,7 @@ module Puma
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