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

Merge remote-tracking branch 'winlin/feature/perf_stat' into feature/rtc

Browse source
This commit is contained in:
winlin 2020-04-05 23:01:21 +08:00
commit 40c95b04ca
9 changed files with 335 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -987,7 +987,10 @@ srs_error_t SrsServer::http_handle()
return srs_error_wrap(err, "handle raw");
}
if ((err = http_api_mux->handle("/api/v1/clusters", new SrsGoApiClusters())) != srs_success) {
return srs_error_wrap(err, "handle raw");
return srs_error_wrap(err, "handle clusters");
}
if ((err = http_api_mux->handle("/api/v1/perf", new SrsGoApiPerf())) != srs_success) {
return srs_error_wrap(err, "handle perf");
}
#ifdef SRS_AUTO_GB28181
if ((err = http_api_mux->handle("/api/v1/gb28181", new SrsGoApiGb28181())) != srs_success) {