From 51f30bf454e82f33443fe4a7f2e0496103c5ec6f Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 26 Dec 2010 07:29:38 +0000 Subject: http_server: remove needless lambda We can just use a begin block at startup, this also makes life easier on RDoc. --- lib/unicorn/http_server.rb | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb index 6f02f29..5323872 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -73,19 +73,17 @@ class Unicorn::HttpServer # Unicorn::HttpServer::START_CTX[0] = "/home/bofh/1.9.2/bin/unicorn" START_CTX = { :argv => ARGV.map { |arg| arg.dup }, - :cwd => lambda { - # favor ENV['PWD'] since it is (usually) symlink aware for - # Capistrano and like systems - begin - a = File.stat(pwd = ENV['PWD']) - b = File.stat(Dir.pwd) - a.ino == b.ino && a.dev == b.dev ? pwd : Dir.pwd - rescue - Dir.pwd - end - }.call, 0 => $0.dup, } + # We favor ENV['PWD'] since it is (usually) symlink aware for Capistrano + # and like systems + START_CTX[:cwd] = begin + a = File.stat(pwd = ENV['PWD']) + b = File.stat(Dir.pwd) + a.ino == b.ino && a.dev == b.dev ? pwd : Dir.pwd + rescue + Dir.pwd + end # Creates a working server on host:port (strange things happen if # port isn't a Number). Use HttpServer::run to start the server and -- cgit v1.2.3-24-ge0c7