Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(446)

Unified Diff: remoting/host/linux/linux_me2me_host.py

Issue 635953002: Linux Chromoting: Explicitly kill all child processes on termination. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/linux/linux_me2me_host.py
diff --git a/remoting/host/linux/linux_me2me_host.py b/remoting/host/linux/linux_me2me_host.py
index 525af8c0aa480a75b0ba9d34610ef5a80da6a700..a461ffb9135ce0645cf86a06971a885a14fbb3b6 100755
--- a/remoting/host/linux/linux_me2me_host.py
+++ b/remoting/host/linux/linux_me2me_host.py
@@ -780,9 +780,13 @@ def cleanup():
global g_desktops
for desktop in g_desktops:
- if desktop.x_proc:
- logging.info("Terminating Xvfb")
- desktop.x_proc.terminate()
+ for proc, name in [(desktop.x_proc, "Xvfb"),
+ (desktop.session_proc, "session"),
+ (desktop.host_proc, "host")]:
+ if proc is not None:
+ logging.info("Terminating " + name)
+ proc.terminate()
rmsousa 2014/10/07 23:01:36 Since we're changing this logic, should we also wa
Lambros 2014/10/08 01:30:53 Done.
+
g_desktops = []
if ParentProcessLogger.instance():
ParentProcessLogger.instance().release_parent()
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698