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, use complex error for http

Browse source
This commit is contained in:
winlin 2017-07-29 21:39:57 +08:00
parent 661eb8b37c
commit 9f5224c34a
24 changed files with 388 additions and 453 deletions
Download patch file Download diff file Expand all files Collapse all files

13
trunk/src/app/srs_app_conn.cpp
View file

@ -98,25 +98,26 @@ srs_error_t SrsConnection::start()
srs_error_t SrsConnection::cycle()
{
int ret = do_cycle();
srs_error_t err = do_cycle();
// Notify manager to remove it.
manager->remove(this);
// success.
if (ret == ERROR_SUCCESS) {
if (err == srs_success) {
srs_trace("client finished.");
return srs_success;
return err;
}
// client close peer.
// TODO: FIXME: Only reset the error when client closed it.
if (srs_is_client_gracefully_close(ret)) {
srs_warn("client disconnect peer. ret=%d", ret);
if (srs_is_client_gracefully_close(srs_error_code(err))) {
srs_warn("client disconnect peer. ret=%d", srs_error_code(err));
srs_freep(err);
return srs_success;
}
return srs_error_new(ret, "cycle");
return srs_error_wrap(err, "cycle");
}
int SrsConnection::srs_id()