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

Refine debug info for edge. 3.0.64

Browse source
This commit is contained in:
winlin 2019-11-30 17:31:27 +08:00
parent 02f459f784
commit 4cd03a7c06
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -152,6 +152,7 @@ Please select according to languages:
### V3 changes ### V3 changes
* v3.0, 2019-11-30, Refine debug info for edge. 3.0.64
* v3.0, 2019-10-30, Cover protocol stack RTMP. 3.0.63 * v3.0, 2019-10-30, Cover protocol stack RTMP. 3.0.63
* v3.0, 2019-10-23, Cover JSON codec. 3.0.62 * v3.0, 2019-10-23, Cover JSON codec. 3.0.62
* v3.0, 2019-10-13, Use http://ossrs.net:8000 as homepage. * v3.0, 2019-10-13, Use http://ossrs.net:8000 as homepage.

3
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -1179,7 +1179,8 @@ srs_error_t SrsRtmpConn::do_token_traverse_auth(SrsRtmpClient* client)
} }
// for token tranverse, always take the debug info(which carries token). // for token tranverse, always take the debug info(which carries token).
if ((err = client->connect_app(req->app, req->tcUrl, req, true, NULL)) != srs_success) { SrsServerInfo si;
if ((err = client->connect_app(req->app, req->tcUrl, req, true, &si)) != srs_success) {
return srs_error_wrap(err, "rtmp: connect tcUrl"); return srs_error_wrap(err, "rtmp: connect tcUrl");
} }

2
trunk/src/core/srs_core.hpp
View file

@ -27,7 +27,7 @@
// The version config. // The version config.
#define VERSION_MAJOR 3 #define VERSION_MAJOR 3
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 63 #define VERSION_REVISION 64
// The macros generated by configure script. // The macros generated by configure script.
#include <srs_auto_headers.hpp> #include <srs_auto_headers.hpp>

3
trunk/src/service/srs_service_rtmp_conn.cpp
View file

@ -139,7 +139,8 @@ srs_error_t SrsBasicRtmpClient::do_connect_app(string local_ip, bool debug)
// upnode server identity will show in the connect_app of client. // upnode server identity will show in the connect_app of client.
// @see https://github.com/ossrs/srs/issues/160 // @see https://github.com/ossrs/srs/issues/160
// the debug_srs_upnode is config in vhost and default to true. // the debug_srs_upnode is config in vhost and default to true.
if ((err = client->connect_app(req->app, tc_url, req, debug, NULL)) != srs_success) { SrsServerInfo si;
if ((err = client->connect_app(req->app, tc_url, req, debug, &si)) != srs_success) {
return srs_error_wrap(err, "connect app tcUrl=%s, debug=%d", tc_url.c_str(), debug); return srs_error_wrap(err, "connect app tcUrl=%s, debug=%d", tc_url.c_str(), debug);
} }