github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refine log, simplify it. to 0.9.90

Browse Source
pull/133/head
winlin 11 years ago
parent 7b530bf8d8
commit f8e8c81e50
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File

10
trunk/src/app/srs_app_rtmp_conn.cpp
Unescape Escape View File

@ -98,8 +98,7 @@ int SrsRtmpConn::do_cycle()
srs_error("get peer ip failed. ret=%d", ret); srs_error("get peer ip failed. ret=%d", ret);
return ret; return ret;
} }
srs_trace("rtmp get peer ip success. ip=%s, send_to=%"PRId64"us, recv_to=%"PRId64"us", srs_trace("serve client, peer ip=%s", ip);
ip, SRS_SEND_TIMEOUT_US, SRS_RECV_TIMEOUT_US);
rtmp->set_recv_timeout(SRS_RECV_TIMEOUT_US); rtmp->set_recv_timeout(SRS_RECV_TIMEOUT_US);
rtmp->set_send_timeout(SRS_SEND_TIMEOUT_US); rtmp->set_send_timeout(SRS_SEND_TIMEOUT_US);
@ -472,10 +471,9 @@ int SrsRtmpConn::playing(SrsSource* source)
pithy_print.elapse(); pithy_print.elapse();
// read from client. // read from client.
int ctl_msg_ret = ERROR_SUCCESS;
if (true) { if (true) {
SrsMessage* msg = NULL; SrsMessage* msg = NULL;
ctl_msg_ret = ret = rtmp->recv_message(&msg); ret = rtmp->recv_message(&msg);
srs_verbose("play loop recv message. ret=%d", ret); srs_verbose("play loop recv message. ret=%d", ret);
if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) { if (ret != ERROR_SUCCESS && ret != ERROR_SOCKET_TIMEOUT) {
@ -503,8 +501,8 @@ int SrsRtmpConn::playing(SrsSource* source)
// reportable // reportable
if (pithy_print.can_print()) { if (pithy_print.can_print()) {
srs_trace("-> "SRS_LOG_ID_PLAY srs_trace("-> "SRS_LOG_ID_PLAY
" time=%"PRId64", duration=%"PRId64", cmr=%d, msgs=%d, obytes=%"PRId64", ibytes=%"PRId64", okbps=%d, ikbps=%d", " time=%"PRId64", duration=%"PRId64", msgs=%d, obytes=%"PRId64", ibytes=%"PRId64", okbps=%d, ikbps=%d",
pithy_print.age(), duration, ctl_msg_ret, count, rtmp->get_send_bytes(), rtmp->get_recv_bytes(), pithy_print.age(), duration, count, rtmp->get_send_bytes(), rtmp->get_recv_bytes(),
rtmp->get_send_kbps(), rtmp->get_recv_kbps()); rtmp->get_send_kbps(), rtmp->get_recv_kbps());
} }

2
trunk/src/core/srs_core.hpp
Unescape Escape View File

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "89" #define VERSION_REVISION "90"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "srs" #define RTMP_SIG_SRS_KEY "srs"

Write Preview
Loading…
Cancel
Save