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

Fix Typos (#1859)

Browse source
This commit is contained in:
Kitten King 2019-07-22 20:03:19 +05:30 • committed by Nate Berkopec
parent 099a4476a3
commit f89f194dcb
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/puma/configuration.rb
View file

@ -20,7 +20,7 @@ module Puma
# In this class any "user" specified options take precedence over any # In this class any "user" specified options take precedence over any
# "file" specified options, take precedence over any "default" options. # "file" specified options, take precedence over any "default" options.
# #
# User input is prefered over "defaults": # User input is preferred over "defaults":
# user_options = { foo: "bar" } # user_options = { foo: "bar" }
# default_options = { foo: "zoo" } # default_options = { foo: "zoo" }
# options = UserFileDefaultOptions.new(user_options, default_options) # options = UserFileDefaultOptions.new(user_options, default_options)
@ -32,7 +32,7 @@ module Puma
# puts options.all_of(:foo) # puts options.all_of(:foo)
# # => ["bar", "zoo"] # # => ["bar", "zoo"]
# #
# A "file" option can be set. This config will be prefered over "default" options # A "file" option can be set. This config will be preferred over "default" options
# but will defer to any available "user" specified options. # but will defer to any available "user" specified options.
# #
# user_options = { foo: "bar" } # user_options = { foo: "bar" }

2
lib/puma/reactor.rb
View file

@ -23,7 +23,7 @@ module Puma
# A connection comes into a `Puma::Server` instance, it is then passed to a `Puma::Reactor` instance, # A connection comes into a `Puma::Server` instance, it is then passed to a `Puma::Reactor` instance,
# which stores it in an array and waits for any of the connections to be ready for reading. # which stores it in an array and waits for any of the connections to be ready for reading.
# #
# The waiting/wake up is performed with nio4r, which will use the apropriate backend (libev, Java NIO or # The waiting/wake up is performed with nio4r, which will use the appropriate backend (libev, Java NIO or
# just plain IO#select). The call to `NIO::Selector#select` will "wake up" and # just plain IO#select). The call to `NIO::Selector#select` will "wake up" and
# return the references to any objects that caused it to "wake". The reactor # return the references to any objects that caused it to "wake". The reactor
# then loops through each of these request objects, and sees if they're complete. If they # then loops through each of these request objects, and sees if they're complete. If they

4
test/test_integration.rb
View file

@ -210,7 +210,7 @@ class TestIntegration < Minitest::Test
skip_on :jruby skip_on :jruby
# we run ls to get a 'safe' pid to pass off as puma in cli stop # we run ls to get a 'safe' pid to pass off as puma in cli stop
# do not want to accidently kill a valid other process # do not want to accidentally kill a valid other process
io = IO.popen(windows? ? "dir" : "ls") io = IO.popen(windows? ? "dir" : "ls")
safe_pid = io.pid safe_pid = io.pid
Process.wait safe_pid Process.wait safe_pid
@ -276,7 +276,7 @@ class TestIntegration < Minitest::Test
rescue Errno::ECONNREFUSED rescue Errno::ECONNREFUSED
# connection was was never accepted # connection was was never accepted
# it can therefore be re-tried before the # it can therefore be re-tried before the
# client receives an empty reponse # client receives an empty response
next_replies << :connection_refused next_replies << :connection_refused
end end
end end

2
tools/jungle/init.d/puma
View file

@ -398,7 +398,7 @@ case "$1" in
;; ;;
remove) remove)
if [ "$#" -lt 2 ]; then if [ "$#" -lt 2 ]; then
echo "Please, specifiy the app's directory to remove." echo "Please, specify the app's directory to remove."
exit 1 exit 1
else else
do_remove $2 do_remove $2