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

shrpx: Log fatal error in spdy upstream

This commit is contained in:
Tatsuhiro Tsujikawa 2012-07-16 23:03:07 +09:00
parent 2afc50bf49
commit e817995063
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/shrpx_client_handler.cc
View File

@ -40,9 +40,7 @@ void upstream_readcb(bufferevent *bev, void *arg)
ClientHandler *handler = reinterpret_cast<ClientHandler*>(arg); ClientHandler *handler = reinterpret_cast<ClientHandler*>(arg);
int rv = handler->on_read(); int rv = handler->on_read();
if(rv != 0) { if(rv != 0) {
if(ENABLE_LOG) { LOG(WARNING) << "<upstream> Read operation (application level) failure";
LOG(INFO) << "<upstream> Read operation (application level) failure";
}
delete handler; delete handler;
} }
} }
@ -57,7 +55,11 @@ void upstream_writecb(bufferevent *bev, void *arg)
delete handler; delete handler;
} else { } else {
Upstream *upstream = handler->get_upstream(); Upstream *upstream = handler->get_upstream();
upstream->on_write(); int rv = upstream->on_write();
if(rv != 0) {
LOG(WARNING) << "<upstream> Write operation (application level) failure";
delete handler;
}
} }
} }
} // namespace } // namespace

41
examples/shrpx_spdy_upstream.cc
View File

@ -60,6 +60,7 @@ ssize_t send_callback(spdylay_session *session,
rv = evbuffer_add(output, data, len); rv = evbuffer_add(output, data, len);
if(rv == -1) { if(rv == -1) {
LOG(FATAL) << "evbuffer_add() failed";
return SPDYLAY_ERR_CALLBACK_FAILURE; return SPDYLAY_ERR_CALLBACK_FAILURE;
} else { } else {
return len; return len;
@ -311,32 +312,33 @@ SpdyUpstream::~SpdyUpstream()
int SpdyUpstream::on_read() int SpdyUpstream::on_read()
{ {
int rv; int rv = 0;
if((rv = spdylay_session_recv(session_)) || if((rv = spdylay_session_recv(session_)) < 0) {
(rv = spdylay_session_send(session_))) {
if(rv != SPDYLAY_ERR_EOF) { if(rv != SPDYLAY_ERR_EOF) {
LOG(ERROR) << "spdylay error: " << spdylay_strerror(rv); LOG(ERROR) << "spdylay_session_recv() returned error: "
DIE(); << spdylay_strerror(rv);
} }
} else if((rv = spdylay_session_send(session_)) < 0) {
LOG(ERROR) << "spdylay_session_send() returned error: "
<< spdylay_strerror(rv);
} }
return 0; return rv;
} }
int SpdyUpstream::on_write() int SpdyUpstream::on_write()
{ {
send(); return send();
return 0;
} }
// After this function call, downstream may be deleted. // After this function call, downstream may be deleted.
int SpdyUpstream::send() int SpdyUpstream::send()
{ {
int rv; int rv = 0;
if((rv = spdylay_session_send(session_))) { if((rv = spdylay_session_send(session_)) < 0) {
LOG(ERROR) << "spdylay error: " << spdylay_strerror(rv); LOG(ERROR) << "spdylay_session_send() returned error: "
DIE(); << spdylay_strerror(rv);
} }
return 0; return rv;
} }
int SpdyUpstream::on_event() int SpdyUpstream::on_event()
@ -509,6 +511,8 @@ int SpdyUpstream::rst_stream(Downstream *downstream, int status_code)
rv = spdylay_submit_rst_stream(session_, downstream->get_stream_id(), rv = spdylay_submit_rst_stream(session_, downstream->get_stream_id(),
status_code); status_code);
if(rv < SPDYLAY_ERR_FATAL) { if(rv < SPDYLAY_ERR_FATAL) {
LOG(FATAL) << "spdylay_submit_rst_stream() failed: "
<< spdylay_strerror(rv);
DIE(); DIE();
} else { } else {
return 0; return 0;
@ -522,6 +526,8 @@ int SpdyUpstream::window_update(Downstream *downstream)
downstream->get_recv_window_size()); downstream->get_recv_window_size());
downstream->set_recv_window_size(0); downstream->set_recv_window_size(0);
if(rv < SPDYLAY_ERR_FATAL) { if(rv < SPDYLAY_ERR_FATAL) {
LOG(FATAL) << "spdylay_submit_window_update() failed: "
<< spdylay_strerror(rv);
DIE(); DIE();
} else { } else {
return 0; return 0;
@ -561,6 +567,7 @@ int SpdyUpstream::error_reply(Downstream *downstream, int status_code)
evbuffer *body = downstream->get_response_body_buf(); evbuffer *body = downstream->get_response_body_buf();
rv = evbuffer_add(body, html.c_str(), html.size()); rv = evbuffer_add(body, html.c_str(), html.size());
if(rv == -1) { if(rv == -1) {
LOG(FATAL) << "evbuffer_add() failed";
DIE(); DIE();
} }
downstream->set_response_state(Downstream::MSG_COMPLETE); downstream->set_response_state(Downstream::MSG_COMPLETE);
@ -580,6 +587,8 @@ int SpdyUpstream::error_reply(Downstream *downstream, int status_code)
rv = spdylay_submit_response(session_, downstream->get_stream_id(), nv, rv = spdylay_submit_response(session_, downstream->get_stream_id(), nv,
&data_prd); &data_prd);
if(rv < SPDYLAY_ERR_FATAL) { if(rv < SPDYLAY_ERR_FATAL) {
LOG(FATAL) << "spdylay_submit_response() failed: "
<< spdylay_strerror(rv);
DIE(); DIE();
} else { } else {
return 0; return 0;
@ -684,7 +693,11 @@ int SpdyUpstream::on_downstream_body(Downstream *downstream,
const uint8_t *data, size_t len) const uint8_t *data, size_t len)
{ {
evbuffer *body = downstream->get_response_body_buf(); evbuffer *body = downstream->get_response_body_buf();
evbuffer_add(body, data, len); int rv = evbuffer_add(body, data, len);
if(rv != 0) {
LOG(FATAL) << "evbuffer_add() failed";
return -1;
}
spdylay_session_resume_data(session_, downstream->get_stream_id()); spdylay_session_resume_data(session_, downstream->get_stream_id());
size_t bodylen = evbuffer_get_length(body); size_t bodylen = evbuffer_get_length(body);