about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2011-06-16 23:57:31 +0000
committerEric Wong <normalperson@yhbt.net>2011-06-17 07:28:12 +0000
commit593deb92e8ebd4e77e482c567d97b6ee496ac378 (patch)
tree9162663c0e66d59225fe28d1f3133a8e118868af /lib
parenta0c59adf71506b8808de276b1288a319424ee71a (diff)
downloadunicorn-593deb92e8ebd4e77e482c567d97b6ee496ac378.tar.gz
rescuing from SystemExit and exit()-ing again is ugly, but
changes made to lower stack depth positively affect _everyone_
so we'll tolerate some ugliness here.

We'll need to disable graceful exit for some tests, too...
Diffstat (limited to 'lib')
-rw-r--r--lib/unicorn/http_server.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb
index 0a9af86..1489495 100644
--- a/lib/unicorn/http_server.rb
+++ b/lib/unicorn/http_server.rb
@@ -474,14 +474,12 @@ class Unicorn::HttpServer
       else
         after_fork_internal
         worker_loop(worker)
-        exit(0)
+        exit
       end
     end
-    rescue SystemExit => e
-      exit!(e.status)
     rescue => e
       @logger.error(e) rescue nil
-      exit!(1)
+      exit!
   end
 
   def maintain_worker_count