Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
re6stnet
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
6
Merge Requests
6
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
re6stnet
Commits
35cd1d4d
Commit
35cd1d4d
authored
Jul 26, 2012
by
Ulysse Beaugnon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace .kill() with .terminate() to terminate subprocesses
parent
e661f4d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
tunnel.py
tunnel.py
+1
-1
vifibnet.py
vifibnet.py
+4
-4
No files found.
tunnel.py
View file @
35cd1d4d
...
...
@@ -121,7 +121,7 @@ class TunnelManager:
utils
.
log
(
'Killing the connection with
%
s...'
%
(
prefix
,),
2
)
connection
=
self
.
_connection_dict
.
pop
(
prefix
)
try
:
connection
.
process
.
kill
()
connection
.
process
.
terminate
()
except
OSError
:
# If the process is already exited
pass
...
...
vifibnet.py
View file @
35cd1d4d
...
...
@@ -165,22 +165,22 @@ def main():
forwarder
.
refresh
()
except
KeyboardInterrupt
:
try
:
router
.
kill
()
router
.
terminate
()
except
:
pass
try
:
server_process
.
kill
()
server_process
.
terminate
()
except
:
pass
tunnel_manager
.
killAll
()
return
0
except
:
try
:
router
.
kill
()
router
.
terminate
()
except
:
pass
try
:
server_process
.
kill
()
server_process
.
terminate
()
except
:
pass
try
:
...
...
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