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

cleanup connections when terminate server.

Browse source
This commit is contained in:
winlin 2015-06-08 14:03:16 +08:00
parent 573495a19f
commit d7e5df2578
6 changed files with 48 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -320,7 +320,7 @@ int SrsRtmpConn::service_cycle()
}
srs_verbose("on_bw_done success");
while (true) {
while (!disposed) {
ret = stream_service_cycle();
// stream service must terminated with error, never success.
@ -361,6 +361,8 @@ int SrsRtmpConn::service_cycle()
srs_error("control message(%d) reject as error. ret=%d", ret, ret);
return ret;
}
return ret;
}
int SrsRtmpConn::stream_service_cycle()
@ -635,7 +637,7 @@ int SrsRtmpConn::do_playing(SrsSource* source, SrsConsumer* consumer, SrsQueueRe
// set the sock options.
play_set_sock_options();
while (true) {
while (!disposed) {
// collect elapse for pithy print.
pprint->elapse();
@ -865,7 +867,7 @@ int SrsRtmpConn::do_publishing(SrsSource* source, SrsPublishRecvThread* trd)
}
int64_t nb_msgs = 0;
while (true) {
while (!disposed) {
pprint->elapse();
// cond wait for error.