Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
re6stnet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Yohann D'Anello
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
Show 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:
...
@@ -121,7 +121,7 @@ class TunnelManager:
utils
.
log
(
'Killing the connection with %s...'
%
(
prefix
,),
2
)
utils
.
log
(
'Killing the connection with %s...'
%
(
prefix
,),
2
)
connection
=
self
.
_connection_dict
.
pop
(
prefix
)
connection
=
self
.
_connection_dict
.
pop
(
prefix
)
try
:
try
:
connection
.
process
.
kill
()
connection
.
process
.
terminate
()
except
OSError
:
except
OSError
:
# If the process is already exited
# If the process is already exited
pass
pass
...
...
vifibnet.py
View file @
35cd1d4d
...
@@ -165,22 +165,22 @@ def main():
...
@@ -165,22 +165,22 @@ def main():
forwarder
.
refresh
()
forwarder
.
refresh
()
except
KeyboardInterrupt
:
except
KeyboardInterrupt
:
try
:
try
:
router
.
kill
()
router
.
terminate
()
except
:
except
:
pass
pass
try
:
try
:
server_process
.
kill
()
server_process
.
terminate
()
except
:
except
:
pass
pass
tunnel_manager
.
killAll
()
tunnel_manager
.
killAll
()
return
0
return
0
except
:
except
:
try
:
try
:
router
.
kill
()
router
.
terminate
()
except
:
except
:
pass
pass
try
:
try
:
server_process
.
kill
()
server_process
.
terminate
()
except
:
except
:
pass
pass
try
:
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