external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

For #1657: Refine code

Browse source
This commit is contained in:
winlin 2020-11-05 21:44:47 +08:00
parent 2fedb683e8
commit 5782b45978
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/app/srs_app_http_conn.cpp
View file

@ -225,8 +225,8 @@ srs_error_t SrsHttpConn::process_requests(SrsRequest** preq)
} }
// ok, handle http request. // ok, handle http request.
if ((err = process_request(&writer, req)) != srs_success) { if ((err = process_request(&writer, req, req_id)) != srs_success) {
return srs_error_wrap(err, "process request"); return srs_error_wrap(err, "process request=%d", req_id);
} }
// After the request is processed. // After the request is processed.
@ -244,12 +244,12 @@ srs_error_t SrsHttpConn::process_requests(SrsRequest** preq)
return err; return err;
} }
srs_error_t SrsHttpConn::process_request(ISrsHttpResponseWriter* w, ISrsHttpMessage* r) srs_error_t SrsHttpConn::process_request(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, int rid)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
srs_trace("HTTP %s:%d %s %s, content-length=%" PRId64 "", srs_trace("HTTP #%d %s:%d %s %s, content-length=%" PRId64 "", rid, ip.c_str(), port,
ip.c_str(), port, r->method_str().c_str(), r->url().c_str(), r->content_length()); r->method_str().c_str(), r->url().c_str(), r->content_length());
// use cors server mux to serve http request, which will proxy to http_remux. // use cors server mux to serve http request, which will proxy to http_remux.
if ((err = cors->serve_http(w, r)) != srs_success) { if ((err = cors->serve_http(w, r)) != srs_success) {

3
trunk/src/app/srs_app_http_conn.hpp
View file

@ -119,8 +119,7 @@ public:
private: private:
virtual srs_error_t do_cycle(); virtual srs_error_t do_cycle();
virtual srs_error_t process_requests(SrsRequest** preq); virtual srs_error_t process_requests(SrsRequest** preq);
private: virtual srs_error_t process_request(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, int rid);
virtual srs_error_t process_request(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
// When the connection disconnect, call this method. // When the connection disconnect, call this method.
// e.g. log msg of connection and report to other system. // e.g. log msg of connection and report to other system.
// @param request: request which is converted by the last http message. // @param request: request which is converted by the last http message.