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
ad7c59ea
Commit
ad7c59ea
authored
Jan 24, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] 修复关闭web terminal tab 关闭session bug
parent
d9a86116
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
httpd.py
coco/httpd.py
+5
-5
models.py
coco/models.py
+1
-0
No files found.
coco/httpd.py
View file @
ad7c59ea
...
@@ -98,9 +98,9 @@ class SSHws(Namespace, BaseWebSocketHandler):
...
@@ -98,9 +98,9 @@ class SSHws(Namespace, BaseWebSocketHandler):
self
.
clients
[
request
.
sid
][
"proxy"
][
connection
]
=
WSProxy
(
self
,
child
,
self
.
clients
[
request
.
sid
][
"room"
],
self
.
clients
[
request
.
sid
][
"proxy"
][
connection
]
=
WSProxy
(
self
,
child
,
self
.
clients
[
request
.
sid
][
"room"
],
connection
)
connection
)
self
.
app
.
clients
.
append
(
self
.
clients
[
request
.
sid
][
"client"
][
connection
])
self
.
app
.
clients
.
append
(
self
.
clients
[
request
.
sid
][
"client"
][
connection
])
self
.
clients
[
request
.
sid
][
"forwarder"
][
connection
]
=
ProxyServer
(
self
.
app
,
self
.
clients
[
request
.
sid
][
"forwarder"
][
connection
]
=
ProxyServer
(
self
.
clients
[
request
.
sid
][
"client"
][
self
.
app
,
self
.
clients
[
request
.
sid
][
"client"
][
connection
]
connection
]
)
)
self
.
socketio
.
start_background_task
(
self
.
clients
[
request
.
sid
][
"forwarder"
][
connection
]
.
proxy
,
asset
,
self
.
socketio
.
start_background_task
(
self
.
clients
[
request
.
sid
][
"forwarder"
][
connection
]
.
proxy
,
asset
,
system_user
)
system_user
)
...
@@ -138,7 +138,7 @@ class SSHws(Namespace, BaseWebSocketHandler):
...
@@ -138,7 +138,7 @@ class SSHws(Namespace, BaseWebSocketHandler):
self
.
on_leave
(
self
.
clients
[
request
.
sid
][
"room"
])
self
.
on_leave
(
self
.
clients
[
request
.
sid
][
"room"
])
try
:
try
:
for
connection
in
self
.
clients
[
request
.
sid
][
"client"
]:
for
connection
in
self
.
clients
[
request
.
sid
][
"client"
]:
self
.
clients
[
request
.
sid
][
"client"
][
connection
]
.
close
(
)
self
.
on_logout
(
connection
)
del
self
.
clients
[
request
.
sid
]
del
self
.
clients
[
request
.
sid
]
except
:
except
:
pass
pass
...
@@ -146,7 +146,7 @@ class SSHws(Namespace, BaseWebSocketHandler):
...
@@ -146,7 +146,7 @@ class SSHws(Namespace, BaseWebSocketHandler):
pass
pass
def
on_logout
(
self
,
connection
):
def
on_logout
(
self
,
connection
):
print
(
"logout"
,
connection
)
logger
.
debug
(
"{} logout"
.
format
(
connection
)
)
if
connection
:
if
connection
:
self
.
clients
[
request
.
sid
][
"proxy"
][
connection
]
.
close
()
self
.
clients
[
request
.
sid
][
"proxy"
][
connection
]
.
close
()
del
self
.
clients
[
request
.
sid
][
"proxy"
][
connection
]
del
self
.
clients
[
request
.
sid
][
"proxy"
][
connection
]
...
...
coco/models.py
View file @
ad7c59ea
...
@@ -225,3 +225,4 @@ class WSProxy:
...
@@ -225,3 +225,4 @@ class WSProxy:
def
close
(
self
):
def
close
(
self
):
self
.
stop_event
.
set
()
self
.
stop_event
.
set
()
self
.
child
.
close
()
self
.
child
.
close
()
logger
.
debug
(
"Proxy {} closed"
.
format
(
self
))
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