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

For #913, source cycle error

Browse source
This commit is contained in:
winlin 2017-06-11 09:40:07 +08:00
parent 7275fd5397
commit 7cac35a289
15 changed files with 161 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -920,8 +920,8 @@ srs_error_t SrsServer::do_cycle()
// the deamon thread, update the time cache
// TODO: FIXME: use SrsHourGlass.
while (true) {
if (handler && (ret = handler->on_cycle()) != ERROR_SUCCESS) {
return srs_error_new(ret, "handle callback");
if (handler && (err = handler->on_cycle()) != srs_success) {
return srs_error_wrap(err, "handle callback");
}
// the interval in config.
@ -979,8 +979,8 @@ srs_error_t SrsServer::do_cycle()
}
// notice the stream sources to cycle.
if ((ret = SrsSource::cycle_all()) != ERROR_SUCCESS) {
return srs_error_new(ret, "source cycle");
if ((err = SrsSource::cycle_all()) != srs_success) {
return srs_error_wrap(err, "source cycle");
}
// update the cache time