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

CI fixes - lib/puma/events.rb, lib/puma/server.rb

Browse source
This commit is contained in:
MSP-Greg 2020-07-19 17:06:10 -05:00
parent 95942e24a9
commit 0166913318
No known key found for this signature in database
GPG key ID: D688DA4A77D8FA18
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/puma/events.rb
View file

@ -65,7 +65,8 @@ module Puma
# Write +str+ to +@stdout+ # Write +str+ to +@stdout+
# #
def log(str) def log(str)
@stdout.puts format(str) @stdout.puts format(str) if @stdout.respond_to? :puts
rescue Errno::EPIPE
end end
def write(str) def write(str)

9
lib/puma/server.rb
View file

@ -317,7 +317,12 @@ module Puma
rescue Exception => e rescue Exception => e
@events.unknown_error e, nil, "Exception handling servers" @events.unknown_error e, nil, "Exception handling servers"
ensure ensure
@check.close unless @check.closed? # Ruby 2.2 issue begin
@check.close unless @check.closed?
rescue Errno::EBADF, RuntimeError
# RuntimeError is Ruby 2.2 issue, can't modify frozen IOError
# Errno::EBADF is infrequently raised
end
@notify.close @notify.close
@notify = nil @notify = nil
@check = nil @check = nil
@ -912,7 +917,7 @@ module Puma
@check, @notify = Puma::Util.pipe unless @notify @check, @notify = Puma::Util.pipe unless @notify
begin begin
@notify << message @notify << message
rescue IOError rescue IOError, NoMethodError, Errno::EPIPE
# The server, in another thread, is shutting down # The server, in another thread, is shutting down
Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
rescue RuntimeError => e rescue RuntimeError => e