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 2016-01-31 22:47:48 +08:00
commit 00c60db7c3
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -529,6 +529,7 @@ class ArmServer:
self.ip = None self.ip = None
self.device_id = None self.device_id = None
self.summaries = None self.summaries = None
self.devices = None
self.public_ip = cherrypy.request.remote.ip self.public_ip = cherrypy.request.remote.ip
self.heartbeat = time.time() self.heartbeat = time.time()
@ -547,6 +548,7 @@ class ArmServer:
data["ip"] = self.ip data["ip"] = self.ip
data["device_id"] = self.device_id data["device_id"] = self.device_id
data["summaries"] = self.summaries data["summaries"] = self.summaries
data["devices"] = self.devices
data["public_ip"] = self.public_ip data["public_ip"] = self.public_ip
data["heartbeat"] = self.heartbeat data["heartbeat"] = self.heartbeat
data["heartbeat_h"] = time.strftime("%Y-%m-%d %H:%M:%S",time.localtime(self.heartbeat)) data["heartbeat_h"] = time.strftime("%Y-%m-%d %H:%M:%S",time.localtime(self.heartbeat))
@ -611,6 +613,8 @@ class RESTServers(object):
node.ip = json_req["ip"] node.ip = json_req["ip"]
if "summaries" in json_req: if "summaries" in json_req:
node.summaries = json_req["summaries"] node.summaries = json_req["summaries"]
if "devices" in json_req:
node.devices = json_req["devices"]
node.device_id = device_id node.device_id = device_id
node.public_ip = cherrypy.request.remote.ip node.public_ip = cherrypy.request.remote.ip
node.heartbeat = time.time() node.heartbeat = time.time()