From 5dea67ecf3dd868e7b375312cdef2c4651b11437 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Wed, 16 Dec 2009 23:57:08 -0800
Subject: cleanup: consolidate write_nonblock error handling

---
 lib/rainbows/revactor.rb | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'lib/rainbows/revactor.rb')

diff --git a/lib/rainbows/revactor.rb b/lib/rainbows/revactor.rb
index ff0e429..b410bda 100644
--- a/lib/rainbows/revactor.rb
+++ b/lib/rainbows/revactor.rb
@@ -68,7 +68,7 @@ module Rainbows
       end while alive and hp.reset.nil? and env.clear
     rescue ::Revactor::TCP::ReadError
     rescue => e
-      handle_error(client, e)
+      Error.write(client.instance_eval { @_io }, e)
     ensure
       client.close
     end
@@ -121,17 +121,6 @@ module Rainbows
       rescue Errno::EMFILE => e
     end
 
-    # if we get any error, try to write something back to the client
-    # assuming we haven't closed the socket, but don't get hung up
-    # if the socket is already closed or broken.  We'll always ensure
-    # the socket is closed at the end of this function
-    def handle_error(client, e)
-      # this is Revactor implementation dependent
-      msg = Error.response(e) and
-        client.instance_eval { @_io.write_nonblock(msg) }
-      rescue
-    end
-
     def revactorize_listeners
       LISTENERS.map do |s|
         case s
-- 
cgit v1.2.3-24-ge0c7