Merge pull request eventmachine#466 from benburkert/attach_server_sig…

…nature Return the signature ID from EventMachine.attach_server.
rb2k · Sep 26, 2013 · 3203c40 · 3203c40
2 parents 89a34c7 + d587bdf
commit 3203c40
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/eventmachine.rb b/lib/eventmachine.rb
@@ -538,6 +538,7 @@ def self.attach_server sock, handler=nil, *args, &block
     sd = sock.respond_to?(:fileno) ? sock.fileno : sock
     s = attach_sd(sd)
     @acceptors[s] = [klass,args,block,sock]
+    s
   end
 
   # Stop a TCP server socket that was started with {EventMachine.start_server}.

diff --git a/tests/test_attach.rb b/tests/test_attach.rb
@@ -68,8 +68,9 @@ def notify_readable
 
   def test_attach_server
     $before = TCPServer.new("127.0.0.1", @port)
+    sig     = nil
     EM.run {
-      EM.attach_server $before, EchoServer
+      sig = EM.attach_server $before, EchoServer
 
       handler = Class.new(EM::Connection) do
         def initialize
@@ -83,6 +84,7 @@ def initialize
 
     assert_equal false, $before.closed?
     assert_equal "hello world", $received_data
+    assert sig.is_a?(Integer)
   end
 
   def test_attach_pipe