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

15
trunk/src/app/srs_app_http_conn.cpp
View file

@ -265,24 +265,25 @@ SrsHttpServer::~SrsHttpServer()
srs_freep(http_static);
}
int SrsHttpServer::initialize()
srs_error_t SrsHttpServer::initialize()
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
// for SRS go-sharp to detect the status of HTTP server of SRS HTTP FLV Cluster.
if ((ret = http_static->mux.handle("/api/v1/versions", new SrsGoApiVersion())) != ERROR_SUCCESS) {
return ret;
return srs_error_new(ret, "handle versin");
}
if ((ret = http_stream->initialize()) != ERROR_SUCCESS) {
return ret;
if ((err = http_stream->initialize()) != srs_success) {
return srs_error_wrap(err, "http stream");
}
if ((ret = http_static->initialize()) != ERROR_SUCCESS) {
return ret;
if ((err = http_static->initialize()) != srs_success) {
return srs_error_wrap(err, "http static");
}
return ret;
return err;
}
int SrsHttpServer::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)