Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
coco
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
coco
Commits
8621de86
Commit
8621de86
authored
Jan 10, 2018
by
广宏伟
Browse files
Options
Browse Files
Download
Plain Diff
Merged in test (pull request #6)
Test
parents
2fb6a9a2
e1a6e75b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
13 deletions
+9
-13
app.py
coco/app.py
+7
-8
interactive.py
coco/interactive.py
+2
-3
session.py
coco/session.py
+0
-2
No files found.
coco/app.py
View file @
8621de86
...
...
@@ -125,6 +125,10 @@ class Coco:
else
:
return
True
def
heartbeat_async
(
self
):
t
=
threading
.
Thread
(
target
=
self
.
heartbeat
)
t
.
start
()
def
handle_task
(
self
,
tasks
):
for
task
in
tasks
:
self
.
task_handler
.
handle
(
task
)
...
...
@@ -212,15 +216,10 @@ class Coco:
def
add_session
(
self
,
session
):
with
self
.
lock
:
self
.
sessions
.
append
(
session
)
self
.
heartbeat
()
self
.
heartbeat
_async
()
def
remove_session
(
self
,
session
):
with
self
.
lock
:
logger
.
info
(
"Remove session: {}"
.
format
(
session
))
for
i
in
range
(
10
):
if
self
.
heartbeat
():
self
.
sessions
.
remove
(
session
)
break
else
:
time
.
sleep
(
1
)
self
.
sessions
.
remove
(
session
)
self
.
heartbeat_async
()
coco/interactive.py
View file @
8621de86
...
...
@@ -134,9 +134,8 @@ class InteractiveServer:
if
q
==
''
:
result
=
self
.
assets
# 用户输入的是数字,可能想使用id唯一键搜索
elif
q
.
isdigit
():
if
len
(
self
.
search_result
)
>=
int
(
q
):
result
=
[
self
.
search_result
[
int
(
q
)
-
1
]]
elif
q
.
isdigit
()
and
self
.
search_result
and
len
(
self
.
search_result
)
>=
int
(
q
):
result
=
[
self
.
search_result
[
int
(
q
)
-
1
]]
# 全匹配到则直接返回全匹配的
if
len
(
result
)
==
0
:
...
...
coco/session.py
View file @
8621de86
...
...
@@ -126,8 +126,6 @@ class Session:
if
len
(
data
)
==
0
:
msg
=
"Server close the connection"
logger
.
info
(
msg
)
for
watcher
in
[
self
.
client
]
+
self
.
_watchers
+
self
.
_sharers
:
watcher
.
send
(
msg
.
encode
(
'utf-8'
))
self
.
close
()
break
for
watcher
in
[
self
.
client
]
+
self
.
_watchers
+
self
.
_sharers
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment