walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Call ConnectBlocker::on_success when connection is established

This commit is contained in:
Tatsuhiro Tsujikawa 2015-01-23 23:00:18 +09:00
parent 3c6b75fb2b
commit ecfd593076
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/shrpx_http_downstream_connection.cc
View File

@ -194,8 +194,6 @@ int HttpDownstreamConnection::attach_downstream(Downstream *downstream) {
continue; continue;
} }
connect_blocker->on_success();
if (LOG_ENABLED(INFO)) { if (LOG_ENABLED(INFO)) {
DCLOG(INFO, this) << "Connecting to downstream server"; DCLOG(INFO, this) << "Connecting to downstream server";
} }
@ -753,17 +751,20 @@ end:
} }
int HttpDownstreamConnection::on_connect() { int HttpDownstreamConnection::on_connect() {
auto connect_blocker = client_handler_->get_http1_connect_blocker();
if (!util::check_socket_connected(fd_)) { if (!util::check_socket_connected(fd_)) {
ev_io_stop(loop_, &wev_); ev_io_stop(loop_, &wev_);
if (LOG_ENABLED(INFO)) { if (LOG_ENABLED(INFO)) {
DLOG(INFO, this) << "downstream connect failed"; DLOG(INFO, this) << "downstream connect failed";
} }
auto connect_blocker = client_handler_->get_http1_connect_blocker();
connect_blocker->on_failure(); connect_blocker->on_failure();
return -1; return -1;
} }
connect_blocker->on_success();
ev_io_start(loop_, &rev_); ev_io_start(loop_, &rev_);
ev_set_cb(&wev_, writecb); ev_set_cb(&wev_, writecb);