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, add complex error.

Browse source
This commit is contained in:
winlin 2017-06-09 11:50:35 +08:00
parent 58521751c3
commit bb200b5d2d
6 changed files with 190 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -557,9 +557,10 @@ void SrsServer::dispose()
#endif
}
int SrsServer::initialize(ISrsServerCycle* cycle_handler)
srs_error_t SrsServer::initialize(ISrsServerCycle* cycle_handler)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
// ensure the time is ok.
srs_update_system_time_ms();
@ -575,15 +576,15 @@ int SrsServer::initialize(ISrsServerCycle* cycle_handler)
handler = cycle_handler;
if(handler && (ret = handler->initialize()) != ERROR_SUCCESS){
return ret;
return srs_error_new(ret, "handler initialize");
}
if ((ret = http_api_mux->initialize()) != ERROR_SUCCESS) {
return ret;
return srs_error_new(ret, "http api initialize");
}
if ((ret = http_server->initialize()) != ERROR_SUCCESS) {
return ret;
return srs_error_new(ret, "http server initialize");
}
http_heartbeat = new SrsHttpHeartbeat();
@ -593,7 +594,7 @@ int SrsServer::initialize(ISrsServerCycle* cycle_handler)
ingester = new SrsIngester();
#endif
return ret;
return err;
}
int SrsServer::initialize_st()

2
trunk/src/app/srs_app_server.hpp
View file

@ -301,7 +301,7 @@ public:
* initialize server with callback handler.
* @remark user must free the cycle handler.
*/
virtual int initialize(ISrsServerCycle* cycle_handler);
virtual srs_error_t initialize(ISrsServerCycle* cycle_handler);
virtual int initialize_st();
virtual int initialize_signal();
virtual int acquire_pid_file();