Permalink
Browse files

Formatting fix

  • Loading branch information...
1 parent 39a06e7 commit 27b2f8e60a87c148bab08bb8ad3448e550b672b8 @evanphx evanphx committed Jul 19, 2012
Showing with 7 additions and 3 deletions.
  1. +1 −1 lib/puma/app/status.rb
  2. +6 −2 lib/puma/cli.rb
@@ -41,7 +41,7 @@ def call(env)
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'
View
@@ -238,8 +238,12 @@ def write_pid
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

0 comments on commit 27b2f8e

Please sign in to comment.