external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

refine the api server.

Browse source
This commit is contained in:
winlin 2015-11-09 14:51:41 +08:00
parent a89ed68aa3
commit d916c53702
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -527,6 +527,7 @@ class ArmServer:
self.id = str(global_arm_server_id)
self.ip = None
self.device_id = None
self.summaries = None
self.public_ip = cherrypy.request.remote.ip
self.heartbeat = time.time()
@ -544,10 +545,11 @@ class ArmServer:
data["id"] = self.id
data["ip"] = self.ip
data["device_id"] = self.device_id
data["summaries"] = self.summaries
data["public_ip"] = self.public_ip
data["heartbeat"] = self.heartbeat
data["heartbeat_h"] = time.strftime("%Y-%m-%d %H:%M:%S",time.localtime(self.heartbeat))
data["summaries"] = "http://%s:1985/api/v1/summaries"%(self.ip)
data["api"] = "http://%s:1985/api/v1/summaries"%(self.ip)
data["console"] = "http://ossrs.net/console/ng_index.html#/summaries?host=%s&port=1985"%(self.ip)
return data
@ -606,6 +608,8 @@ class RESTServers(object):
self.__nodes.append(node)
node.ip = json_req["ip"]
if "summaries" in json_req:
node.summaries = json_req["summaries"]
node.device_id = device_id
node.public_ip = cherrypy.request.remote.ip
node.heartbeat = time.time()