Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-08-11 13:09:21 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d761ebfa55eda09d6ec22cd744a64cbcbefafded
d761ebfa
1 parent
c5bf3972
refine the api, move the requests and errors to rest.
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
30 行增加
和
14 行删除
trunk/src/app/srs_app_http_api.cpp
trunk/src/app/srs_app_server.cpp
trunk/src/app/srs_app_http_api.cpp
查看文件 @
d761ebf
...
...
@@ -110,7 +110,12 @@ int SrsGoApiV1::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
<<
SRS_JFIELD_STR
(
"requests"
,
"the request itself, for http debug"
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_STR
(
"vhosts"
,
"dumps vhost to json"
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_STR
(
"streams"
,
"dumps streams to json"
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_STR
(
"errors"
,
"always return an error 100."
)
<<
SRS_JFIELD_ORG
(
"test"
,
SRS_JOBJECT_START
)
<<
SRS_JFIELD_STR
(
"requests"
,
"show the request info"
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_STR
(
"errors"
,
"always return an error 100"
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_STR
(
"redirects"
,
"always redirect to /api/v1/test/errors"
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_STR
(
".vhost."
,
"http vhost for error.srs.com/api/v1/test/errors"
)
<<
SRS_JOBJECT_END
<<
SRS_JOBJECT_END
<<
SRS_JOBJECT_END
;
...
...
@@ -442,9 +447,9 @@ int SrsGoApiVhosts::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
std
::
stringstream
ss
;
ss
<<
SRS_JOBJECT_START
<<
SRS_JFIELD_ERROR
(
ret
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_ORG
(
"server"
,
stat
->
server_id
())
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_ORG
(
"vhosts"
,
data
.
str
())
<<
SRS_JFIELD_ERROR
(
ret
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_ORG
(
"server"
,
stat
->
server_id
())
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_ORG
(
"vhosts"
,
data
.
str
())
<<
SRS_JOBJECT_END
;
return
srs_http_response_json
(
w
,
ss
.
str
());
...
...
@@ -467,9 +472,9 @@ int SrsGoApiStreams::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
std
::
stringstream
ss
;
ss
<<
SRS_JOBJECT_START
<<
SRS_JFIELD_ERROR
(
ret
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_ORG
(
"server"
,
stat
->
server_id
())
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_ORG
(
"streams"
,
data
.
str
())
<<
SRS_JFIELD_ERROR
(
ret
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_ORG
(
"server"
,
stat
->
server_id
())
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_ORG
(
"streams"
,
data
.
str
())
<<
SRS_JOBJECT_END
;
return
srs_http_response_json
(
w
,
ss
.
str
());
...
...
@@ -488,8 +493,9 @@ int SrsGoApiError::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
std
::
stringstream
ss
;
ss
<<
SRS_JOBJECT_START
<<
SRS_JFIELD_ERROR
(
100
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_STR
(
"msg"
,
"SRS demo error."
)
<<
SRS_JFIELD_ERROR
(
100
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_STR
(
"msg"
,
"SRS demo error."
)
<<
SRS_JFIELD_CONT
<<
SRS_JFIELD_STR
(
"path"
,
r
->
path
())
<<
SRS_JOBJECT_END
;
return
srs_http_response_json
(
w
,
ss
.
str
());
...
...
trunk/src/app/srs_app_server.cpp
查看文件 @
d761ebf
...
...
@@ -800,17 +800,27 @@ int SrsServer::http_handle()
if
((
ret
=
http_api_mux
->
handle
(
"/api/v1/authors"
,
new
SrsGoApiAuthors
()))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
if
((
ret
=
http_api_mux
->
handle
(
"/api/v1/requests"
,
new
SrsGoApiRequests
()))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
if
((
ret
=
http_api_mux
->
handle
(
"/api/v1/vhosts"
,
new
SrsGoApiVhosts
()))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
if
((
ret
=
http_api_mux
->
handle
(
"/api/v1/streams"
,
new
SrsGoApiStreams
()))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
// for error test which always response error code 100.
if
((
ret
=
http_api_mux
->
handle
(
"/api/v1/errors"
,
new
SrsGoApiError
()))
!=
ERROR_SUCCESS
)
{
// test the request info.
if
((
ret
=
http_api_mux
->
handle
(
"/api/v1/test/requests"
,
new
SrsGoApiRequests
()))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
// test the error code response.
if
((
ret
=
http_api_mux
->
handle
(
"/api/v1/test/errors"
,
new
SrsGoApiError
()))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
// test the redirect mechenism.
if
((
ret
=
http_api_mux
->
handle
(
"/api/v1/test/redirects"
,
new
SrsHttpRedirectHandler
(
"/api/v1/test/errors"
,
SRS_CONSTS_HTTP_MovedPermanently
)))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
// test the http vhost.
if
((
ret
=
http_api_mux
->
handle
(
"error.srs.com/api/v1/test/errors"
,
new
SrsGoApiError
()))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
...
...
请
注册
或
登录
后发表评论