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

shrpx: Remove upstream_spdy_stream and upstream_spdy_stream_close 

upstream_response logs more detailed information.
This commit is contained in:
Tatsuhiro Tsujikawa 2012-12-09 23:30:11 +09:00
parent 90eebbc88c
commit 8c456674cf
3 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/shrpx_accesslog.cc
View File

@ -63,31 +63,6 @@ void upstream_connect(const std::string& client_ip)
} }
} }
void upstream_spdy_stream(const std::string& client_ip, int32_t stream_id)
{
char datestr[64];
get_datestr(datestr);
fprintf(stderr, "%s [%s] SYN_STREAM %d\n", client_ip.c_str(), datestr,
stream_id);
fflush(stderr);
if(get_config()->use_syslog) {
syslog(LOG_INFO, "%s SYN_STREAM %d\n", client_ip.c_str(), stream_id);
}
}
void upstream_spdy_stream_close(const std::string& client_ip,
int32_t stream_id)
{
char datestr[64];
get_datestr(datestr);
fprintf(stderr, "%s [%s] STREAM_CLOSE %d\n",
client_ip.c_str(), datestr, stream_id);
fflush(stderr);
if(get_config()->use_syslog) {
syslog(LOG_INFO, "%s STREAM_CLOSE %d\n", client_ip.c_str(), stream_id);
}
}
namespace { namespace {
const char* status_code_color(int status_code) const char* status_code_color(int status_code)
{ {

3
src/shrpx_accesslog.h
View File

@ -34,9 +34,6 @@ namespace shrpx {
class Downstream; class Downstream;
void upstream_connect(const std::string& client_ip); void upstream_connect(const std::string& client_ip);
void upstream_spdy_stream(const std::string& client_ip, int32_t stream_id);
void upstream_spdy_stream_close(const std::string& client_ip,
int32_t stream_id);
void upstream_response(const std::string& client_ip, int status_code, void upstream_response(const std::string& client_ip, int status_code,
Downstream *downstream); Downstream *downstream);

8
src/shrpx_spdy_upstream.cc
View File

@ -99,10 +99,6 @@ void on_stream_close_callback
<< " is being closed"; << " is being closed";
} }
Downstream *downstream = upstream->find_downstream(stream_id); Downstream *downstream = upstream->find_downstream(stream_id);
if(get_config()->accesslog) {
upstream_spdy_stream_close(upstream->get_client_handler()->get_ipaddr(),
stream_id);
}
if(downstream) { if(downstream) {
if(downstream->get_request_state() == Downstream::CONNECT_FAIL) { if(downstream->get_request_state() == Downstream::CONNECT_FAIL) {
upstream->remove_downstream(downstream); upstream->remove_downstream(downstream);
@ -219,10 +215,6 @@ void on_ctrl_recv_callback
upstream->rst_stream(downstream, SPDYLAY_INTERNAL_ERROR); upstream->rst_stream(downstream, SPDYLAY_INTERNAL_ERROR);
return; return;
} }
if(get_config()->accesslog) {
upstream_spdy_stream(upstream->get_client_handler()->get_ipaddr(),
frame->syn_stream.stream_id);
}
downstream->set_request_state(Downstream::HEADER_COMPLETE); downstream->set_request_state(Downstream::HEADER_COMPLETE);
if(frame->syn_stream.hd.flags & SPDYLAY_CTRL_FLAG_FIN) { if(frame->syn_stream.hd.flags & SPDYLAY_CTRL_FLAG_FIN) {
downstream->set_request_state(Downstream::MSG_COMPLETE); downstream->set_request_state(Downstream::MSG_COMPLETE);