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

Merge pull request #791 from unleashed/allow_empty_tags

Browse source 
configuration: allow empty tags to mean no tag desired
This commit is contained in:
Evan Phoenix 2015-10-01 09:21:39 -07:00
commit 264dc0583c
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
examples/config.rb
View file

@ -144,6 +144,9 @@
# Additional text to display in process listing # Additional text to display in process listing
# #
# tag 'app name' # tag 'app name'
#
# If you do not specify a tag, Puma will infer it. If you do not want Puma
# to add a tag, use an empty string.
# Change the default timeout of workers # Change the default timeout of workers
# #

2
lib/puma/cli.rb
View file

@ -266,7 +266,7 @@ module Puma
private private
def title def title
buffer = "puma #{Puma::Const::VERSION} (#{@options[:binds].join(',')})" buffer = "puma #{Puma::Const::VERSION} (#{@options[:binds].join(',')})"
buffer << " [#{@options[:tag]}]" if @options[:tag] buffer << " [#{@options[:tag]}]" if @options[:tag] && !@options[:tag].empty?
buffer buffer
end end

2
lib/puma/cluster.rb
View file

@ -186,7 +186,7 @@ module Puma
def worker(index, master) def worker(index, master)
title = "puma: cluster worker #{index}: #{master}" title = "puma: cluster worker #{index}: #{master}"
title << " [#{@options[:tag]}]" if @options[:tag] title << " [#{@options[:tag]}]" if @options[:tag] && !@options[:tag].empty?
$0 = title $0 = title
Signal.trap "SIGINT", "IGNORE" Signal.trap "SIGINT", "IGNORE"