winlin

refine log, simplify it. to 0.9.90

@@ -98,8 +98,7 @@ int SrsRtmpConn::do_cycle() @@ -98,8 +98,7 @@ int SrsRtmpConn::do_cycle()
98 srs_error("get peer ip failed. ret=%d", ret); 98 srs_error("get peer ip failed. ret=%d", ret);
99 return ret; 99 return ret;
100 } 100 }
101 - srs_trace("rtmp get peer ip success. ip=%s, send_to=%"PRId64"us, recv_to=%"PRId64"us",  
102 - ip, SRS_SEND_TIMEOUT_US, SRS_RECV_TIMEOUT_US); 101 + srs_trace("serve client, peer ip=%s", ip);
103 102
104 rtmp->set_recv_timeout(SRS_RECV_TIMEOUT_US); 103 rtmp->set_recv_timeout(SRS_RECV_TIMEOUT_US);
105 rtmp->set_send_timeout(SRS_SEND_TIMEOUT_US); 104 rtmp->set_send_timeout(SRS_SEND_TIMEOUT_US);
@@ -472,10 +471,9 @@ int SrsRtmpConn::playing(SrsSource* source) @@ -472,10 +471,9 @@ int SrsRtmpConn::playing(SrsSource* source)
472 pithy_print.elapse(); 471 pithy_print.elapse();
473 472
474 // read from client. 473 // read from client.
475 - int ctl_msg_ret = ERROR_SUCCESS;  
476 if (true) { 474 if (true) {
477 SrsMessage* msg = NULL; 475 SrsMessage* msg = NULL;
478 - ctl_msg_ret = ret = rtmp->recv_message(&msg); 476 + ret = rtmp->recv_message(&msg);
479 477
480 srs_verbose("play loop recv message. ret=%d", ret); 478 srs_verbose("play loop recv message. ret=%d", ret);
481 if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) { 479 if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) {
@@ -503,8 +501,8 @@ int SrsRtmpConn::playing(SrsSource* source) @@ -503,8 +501,8 @@ int SrsRtmpConn::playing(SrsSource* source)
503 // reportable 501 // reportable
504 if (pithy_print.can_print()) { 502 if (pithy_print.can_print()) {
505 srs_trace("-> "SRS_LOG_ID_PLAY 503 srs_trace("-> "SRS_LOG_ID_PLAY
506 - " time=%"PRId64", duration=%"PRId64", cmr=%d, msgs=%d, obytes=%"PRId64", ibytes=%"PRId64", okbps=%d, ikbps=%d",  
507 - pithy_print.age(), duration, ctl_msg_ret, count, rtmp->get_send_bytes(), rtmp->get_recv_bytes(), 504 + " time=%"PRId64", duration=%"PRId64", msgs=%d, obytes=%"PRId64", ibytes=%"PRId64", okbps=%d, ikbps=%d",
  505 + pithy_print.age(), duration, count, rtmp->get_send_bytes(), rtmp->get_recv_bytes(),
508 rtmp->get_send_kbps(), rtmp->get_recv_kbps()); 506 rtmp->get_send_kbps(), rtmp->get_recv_kbps());
509 } 507 }
510 508
@@ -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 "89" 34 +#define VERSION_REVISION "90"
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"