R3944Realms/srs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.0release' into develop

Browse Source
This commit is contained in:
winlin 2015-08-25 11:55:44 +08:00
commit 7de181004f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/src/app/srs_app_rtmp_conn.cpp
View File

@ -210,8 +210,6 @@ int SrsRtmpConn::do_cycle()
ret = service_cycle(); ret = service_cycle();
http_hooks_on_close(); http_hooks_on_close();
SrsStatistic* stat = SrsStatistic::instance();
stat->on_disconnect(_srs_context->get_id());
return ret; return ret;
} }

1
trunk/src/app/srs_app_server.cpp
View File

@ -896,6 +896,7 @@ void SrsServer::remove(SrsConnection* conn)
SrsStatistic* stat = SrsStatistic::instance(); SrsStatistic* stat = SrsStatistic::instance();
stat->kbps_add_delta(conn); stat->kbps_add_delta(conn);
stat->on_disconnect(conn->srs_id());
// all connections are created by server, // all connections are created by server,
// so we free it here. // so we free it here.