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, refine the error mechanism

Browse source
This commit is contained in:
winlin 2017-06-09 13:29:23 +08:00
parent bb200b5d2d
commit 93710c7489
11 changed files with 38 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -559,7 +559,6 @@ void SrsServer::dispose()
srs_error_t SrsServer::initialize(ISrsServerCycle* cycle_handler)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
// ensure the time is ok.
@ -575,16 +574,16 @@ srs_error_t SrsServer::initialize(ISrsServerCycle* cycle_handler)
signal_manager = new SrsSignalManager(this);
handler = cycle_handler;
if(handler && (ret = handler->initialize()) != ERROR_SUCCESS){
return srs_error_new(ret, "handler initialize");
if(handler && (err = handler->initialize()) != srs_success){
return srs_error_wrap(err, "handler initialize");
}
if ((ret = http_api_mux->initialize()) != ERROR_SUCCESS) {
return srs_error_new(ret, "http api initialize");
if ((err = http_api_mux->initialize()) != srs_success) {
return srs_error_wrap(err, "http api initialize");
}
if ((ret = http_server->initialize()) != ERROR_SUCCESS) {
return srs_error_new(ret, "http server initialize");
if ((err = http_server->initialize()) != srs_success) {
return srs_error_wrap(err, "http server initialize");
}
http_heartbeat = new SrsHttpHeartbeat();