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 branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-11-09 15:25:55 +08:00
commit 7db7d43aea
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/research/api-server/server.py
View file

@ -622,7 +622,7 @@ class RESTServers(object):
''' '''
get all servers which report to this api-server. get all servers which report to this api-server.
''' '''
def GET(self): def GET(self, id=None):
enable_crossdomain() enable_crossdomain()
try: try:
@ -632,6 +632,7 @@ class RESTServers(object):
data = [] data = []
for node in self.__nodes: for node in self.__nodes:
if id == None or node.id == str(id) or node.device_id == str(id):
data.append(node.json_dump()) data.append(node.json_dump())
return json.dumps(data) return json.dumps(data)