winlin

update log, add dsu(debug_srs_upnode), 0.9.204

@@ -256,7 +256,8 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port) @@ -256,7 +256,8 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port)
256 // the debug_srs_upnode is config in vhost and default to true. 256 // the debug_srs_upnode is config in vhost and default to true.
257 bool debug_srs_upnode = _srs_config->get_debug_srs_upnode(req->vhost); 257 bool debug_srs_upnode = _srs_config->get_debug_srs_upnode(req->vhost);
258 if ((ret = client->connect_app(req->app, tc_url, req, debug_srs_upnode)) != ERROR_SUCCESS) { 258 if ((ret = client->connect_app(req->app, tc_url, req, debug_srs_upnode)) != ERROR_SUCCESS) {
259 - srs_error("connect with server failed, tcUrl=%s. ret=%d", tc_url.c_str(), ret); 259 + srs_error("connect with server failed, tcUrl=%s, dsu=%d. ret=%d",
  260 + tc_url.c_str(), debug_srs_upnode, ret);
260 return ret; 261 return ret;
261 } 262 }
262 263
@@ -686,7 +687,8 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port) @@ -686,7 +687,8 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port)
686 // the debug_srs_upnode is config in vhost and default to true. 687 // the debug_srs_upnode is config in vhost and default to true.
687 bool debug_srs_upnode = _srs_config->get_debug_srs_upnode(req->vhost); 688 bool debug_srs_upnode = _srs_config->get_debug_srs_upnode(req->vhost);
688 if ((ret = client->connect_app(req->app, tc_url, req, debug_srs_upnode)) != ERROR_SUCCESS) { 689 if ((ret = client->connect_app(req->app, tc_url, req, debug_srs_upnode)) != ERROR_SUCCESS) {
689 - srs_error("connect with server failed, tcUrl=%s. ret=%d", tc_url.c_str(), ret); 690 + srs_error("connect with server failed, tcUrl=%s, dsu=%d. ret=%d",
  691 + tc_url.c_str(), debug_srs_upnode, ret);
690 return ret; 692 return ret;
691 } 693 }
692 694
@@ -352,7 +352,8 @@ int SrsForwarder::connect_app(string ep_server, string ep_port) @@ -352,7 +352,8 @@ int SrsForwarder::connect_app(string ep_server, string ep_port)
352 // the debug_srs_upnode is config in vhost and default to true. 352 // the debug_srs_upnode is config in vhost and default to true.
353 bool debug_srs_upnode = _srs_config->get_debug_srs_upnode(req->vhost); 353 bool debug_srs_upnode = _srs_config->get_debug_srs_upnode(req->vhost);
354 if ((ret = client->connect_app(req->app, tc_url, req, debug_srs_upnode)) != ERROR_SUCCESS) { 354 if ((ret = client->connect_app(req->app, tc_url, req, debug_srs_upnode)) != ERROR_SUCCESS) {
355 - srs_error("connect with server failed, tcUrl=%s. ret=%d", tc_url.c_str(), ret); 355 + srs_error("connect with server failed, tcUrl=%s, dsu=%d. ret=%d",
  356 + tc_url.c_str(), debug_srs_upnode, ret);
356 return ret; 357 return ret;
357 } 358 }
358 359
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR "0" 32 #define VERSION_MAJOR "0"
33 #define VERSION_MINOR "9" 33 #define VERSION_MINOR "9"
34 -#define VERSION_REVISION "203" 34 +#define VERSION_REVISION "204"
35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION 35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"
@@ -536,8 +536,8 @@ int SrsRtmpClient::connect_app2( @@ -536,8 +536,8 @@ int SrsRtmpClient::connect_app2(
536 srs_pid = (int)prop->to_number(); 536 srs_pid = (int)prop->to_number();
537 } 537 }
538 } 538 }
539 - srs_trace("connected, version=%s, ip=%s, pid=%d, id=%d",  
540 - srs_version.c_str(), srs_server_ip.c_str(), srs_pid, srs_id); 539 + srs_trace("connected, version=%s, ip=%s, pid=%d, id=%d, dsu=%d",
  540 + srs_version.c_str(), srs_server_ip.c_str(), srs_pid, srs_id, debug_srs_upnode);
541 541
542 return ret; 542 return ret;
543 } 543 }