diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 04:19:17 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 04:19:17 +0000 |
| commit | b5f8e194110259bc48aba41826ced5922e8aeb65 (patch) | |
| tree | df83319f2192018ed0f3b627cea9c8be89ed29ce /remoting | |
| parent | 6e9f6aa377b7c21441f5b0598572b195c3382426 (diff) | |
| download | chromium_src-b5f8e194110259bc48aba41826ced5922e8aeb65.zip chromium_src-b5f8e194110259bc48aba41826ced5922e8aeb65.tar.gz chromium_src-b5f8e194110259bc48aba41826ced5922e8aeb65.tar.bz2 | |
Don't display the PID of a currently-running Virtual Me2Me daemon.
This is to discourage people from seeing the PID of the other instance, and
typing "kill -9 <PID>", which would leave the desktop and host processes still
running but unmanaged.
BUG=None
TEST=Manual
Review URL: http://codereview.chromium.org/9375003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rwxr-xr-x | remoting/tools/me2me_virtual_host.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/remoting/tools/me2me_virtual_host.py b/remoting/tools/me2me_virtual_host.py index 907464e..41115c5 100755 --- a/remoting/tools/me2me_virtual_host.py +++ b/remoting/tools/me2me_virtual_host.py @@ -460,8 +460,7 @@ def daemonize(log_filename): # Parent process os._exit(0) - logging.info("Daemon process running, PID = %d, logging to '%s'" % - (os.getpid(), log_filename)) + logging.info("Daemon process running, logging to '%s'" % log_filename) os.chdir(HOME_DIR) @@ -615,13 +614,9 @@ def main(): running, pid = g_pidfile.check() if running: - if pid == 0: - pid = 'unknown' - - logging.error("An instance of this script is already running, PID is %s." % - pid) - logging.error("If this isn't the case, delete '%s' and try again." % - pid_filename) + print "An instance of this script is already running." + print "Use the -k flag to terminate the running instance." + print "If this isn't the case, delete '%s' and try again." % pid_filename return 1 g_pidfile.create() |