fix the error in running fail_cb in iostream (#324)

* fix the error in running fail_cb in iostream * fix the args of fail_cb when using iostream in dail * websocket->async: fetch:dns failed, _throw_error duplicate calls When using websocket, when dns resoved failed, _throw_error duplicate calls in async: fetch
kernelsauce · Oct 28, 2017 · 1f597e2 · 1f597e2
1 parent b6ccaba
commit 1f597e2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/turbo/async.lua b/turbo/async.lua
@@ -368,10 +368,6 @@ function async.HTTPClient:_connect()
                 self._handle_connect,
                 self._handle_connect_fail,
                 self)
-            if rc ~= 0 then
-                self:_throw_error(errors.COULD_NOT_CONNECT, msg)
-                return -1
-            end
         elseif self.schema == "wss" then
             if not self.ssl_options or not self.ssl_options._ssl_ctx then
                 self.ssl_options = self.ssl_options or {}

diff --git a/turbo/iosimple.lua b/turbo/iosimple.lua
@@ -105,8 +105,8 @@ function iosimple.dial(address, ssl, io)
                 ctx:set_arguments({true})
                 ctx:finalize_context()
             end,
-            function(rc, strerr, errdesc)
-                ctx:set_arguments({false, rc, strerr, errdesc})
+            function(errdesc)
+                ctx:set_arguments({false, errdesc})
                 ctx:finalize_context()
             end
         )
@@ -117,13 +117,13 @@ function iosimple.dial(address, ssl, io)
                 ctx:set_arguments({true})
                 ctx:finalize_context()
             end,
-            function(rc, strerr, errdesc)
-                ctx:set_arguments({false, rc, strerr, errdesc})
+            function(errdesc)
+                ctx:set_arguments({false, errdesc})
                 ctx:finalize_context()
             end
         )
     end
-    local rc, sockerr, strerr, errdesc = coroutine.yield(ctx)
+    local rc, errdesc = coroutine.yield(ctx)
     if rc ~= true then
         error(errdesc)
     end

diff --git a/turbo/iostream.lua b/turbo/iostream.lua
@@ -478,11 +478,7 @@ function iostream.IOStream:_handle_connect_fail(err)
     self._connect_callback = nil
     self._connect_callback_arg = nil
     self._connecting = false
-    if arg then
-        cb(arg, err)
-    else
-        cb(err)
-    end
+    self:_run_callback(cb, arg, err)
 end
 
 --- Main event handler for the IOStream.