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

Formatting fix

Browse source
This commit is contained in:
Evan Phoenix 2012-07-19 16:38:16 -07:00
parent 39a06e702a
commit 27b2f8e60a
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/puma/app/status.rb
View file

@ -41,7 +41,7 @@ module Puma
when "/stats"
b = @server.backlog
r = @server.running
return rack_response(200, %Q!{ "backlog": #{b}, "running": #{r} }!)
return rack_response(200, %Q!{ "backlog": #{b}, "running": #{r} }!)
end
rack_response 404, "Unsupported action", 'text/plain'

8
lib/puma/cli.rb
View file

@ -238,8 +238,12 @@ module Puma
end
def set_rack_environment
# Try the user option first, then the environment variable, finally default to development
ENV['RACK_ENV'] = @options[:environment] || ENV['RACK_ENV'] || 'development'
# Try the user option first, then the environment variable,
# finally default to development
ENV['RACK_ENV'] = @options[:environment] ||
ENV['RACK_ENV'] ||
'development'
end
def delete_pidfile