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
2016-01-31 21:49:53 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f7d9ed5ae484655d85667f99f419f7316ffb89da
f7d9ed5a
1 parent
b51cd599
update api
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
4 行增加
和
0 行删除
trunk/research/api-server/server.py
trunk/research/api-server/server.py
查看文件 @
f7d9ed5
...
...
@@ -528,6 +528,7 @@ class ArmServer:
self
.
ip
=
None
self
.
device_id
=
None
self
.
summaries
=
None
self
.
devices
=
None
self
.
public_ip
=
cherrypy
.
request
.
remote
.
ip
self
.
heartbeat
=
time
.
time
()
...
...
@@ -546,6 +547,7 @@ class ArmServer:
data
[
"ip"
]
=
self
.
ip
data
[
"device_id"
]
=
self
.
device_id
data
[
"summaries"
]
=
self
.
summaries
data
[
"devices"
]
=
self
.
devices
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
))
...
...
@@ -610,6 +612,8 @@ class RESTServers(object):
node
.
ip
=
json_req
[
"ip"
]
if
"summaries"
in
json_req
:
node
.
summaries
=
json_req
[
"summaries"
]
if
"devices"
in
json_req
:
node
.
devices
=
json_req
[
"devices"
]
node
.
device_id
=
device_id
node
.
public_ip
=
cherrypy
.
request
.
remote
.
ip
node
.
heartbeat
=
time
.
time
()
...
...
请
注册
或
登录
后发表评论