Chromoting: stopping the service if the host ID is permanently not recognized by the could.

remoting/tools/me2me_virtual_host.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Virtual Me2Me implementation.  This script runs and manages the processes
 # required for a Virtual Me2Me desktop, which are: X server, X desktop
 # session, and Host process.
 # This script is intended to run continuously as a background daemon
 # process, running under an ordinary (non-root) user account.
@@ skipping 713 matching lines @@
       desktop.x_proc = None
 
     if desktop.session_proc is not None and pid == desktop.session_proc.pid:
       logging.info("Session process terminated")
       desktop.session_proc = None
 
     if desktop.host_proc is not None and pid == desktop.host_proc.pid:
       logging.info("Host process terminated")
       desktop.host_proc = None
 
-      # The exit-code must match the one used in HeartbeatSender.
-      if os.WEXITSTATUS(status) == 100:
+      # These exit-codes must match the one used by the host.

[Lambros, 2012/04/17 19:01:19]

s/one/ones
or
s/the one/those

[alexeypa (please no reviews), 2012/04/17 19:20:32]

Done.

+      # See remoting/host/constants.h.
+      if os.WEXITSTATUS(status) == 1:

[Lambros, 2012/04/17 19:01:19]

Please don't use exit code number 1.  The problem is that, if Xvfb crashes, the
me2me_host process will exit with code 1, because it links with libX11.so, and
that library calls exit(1) whenever the connection to the X server is lost (yes,
I know libraries shouldn't call exit() - this is a well-known quirk of libX11 :)

In that case, this script would try to re-launch Xvfb, but it would exit instead
of relaunching the me2me_host, because it mistakes the exit code 1 to mean that
the Host configuration is invalid.

[alexeypa (please no reviews), 2012/04/17 19:20:32]

Done.

+        logging.info("Host configuration is invalid - exiting.")
+      elif os.WEXITSTATUS(status) == 2:
         logging.info("Host ID has been deleted - exiting.")
-        # Host config is no longer valid.  Delete it, so the next time this
-        # script is run, a new Host ID will be created and registered.
+      elif os.WEXITSTATUS(status) == 3:
+        logging.info("OAuth credentials are invalid - exiting.")
+
+      # The host config is no longer valid if either of these codes is returned.
+      # Delete it, so the next time this script is run, a new configuration
+      # will be created and registered.
+      if os.WEXITSTATUS(status) == 1 or
+         os.WEXITSTATUS(status) == 2 or
+         os.WEXITSTATUS(status) == 3:

[Lambros, 2012/04/17 19:01:19]

In case 3, should remove auth.config_file rather than host.config_file.  If you
want, you could then move these remove() calls into the previous if statement.
You could put os.WEXITSTATUS(status) into a temporary "exit_code" variable to
avoid repeating this code.

[alexeypa (please no reviews), 2012/04/17 19:20:32]

Done.

         os.remove(host.config_file)
         return 0
 
-
 if __name__ == "__main__":
   logging.basicConfig(level=logging.DEBUG)
   sys.exit(main())