Merge lp:~nataliabidart/ubuntu-sso-client/add-sighup-handler into lp:ubuntu-sso-client

[Natalia Bidart]

* Added handler for SIGHUP to stop the service (LP: #633300).

To test, please do:

nessita@dali:~/canonical/ubuntu-sso-client/add-sighup-handler$ killall ubuntu-sso-login; DEBUG=True PYTHONPATH=. bin/ubuntu-sso-login

And in other console, kill -SIGHUP <pid of ubuntu-sso-login>

To confirm the handler is working, you can see the logs:

Installing the Twisted gtk2reactor.
Hooking up SIGHUP with handler <function sighup_handler at 0x13f1050>.
Starting Ubuntu SSO login manager for bus 'com.ubuntu.sso'.
Stoping Ubuntu SSO login manager since SIGHUP was received .

[Roman Yepishev (rye)]

Yup, it hangs up though w/o this code the process is killed with SIGHUP too :)

review: Approve (fieldtest)

[lp:~nataliabidart/ubuntu-sso-client/add-sighup-handler]

619. By Natalia Bidart on 2010-09-08

Added disclaimer on SIGHUP handler.

[John Lenton (chipaca)]

Yeah.

review: Approve

=== modified file 'bin/ubuntu-sso-login'
--- bin/ubuntu-sso-login	2010-09-02 17:03:56 +0000
+++ bin/ubuntu-sso-login	2010-09-08 18:37:40 +0000
@@ -22,6 +22,7 @@
 """Run the dbus service for UserManagement and ApplicationCredentials."""
 
 import gtk
+import signal
 import sys
 
 import dbus.service
@@ -41,6 +42,20 @@
 gtk.gdk.threads_init()
 DBusGMainLoop(set_as_default=True)
 
+
+def sighup_handler(*a, **kw):
+    """Stop the service.
+
+    This is not thread safe, see the link below for info:
+    www.listware.net/201004/gtk-devel-list/115067-unix-signals-in-glib.html
+    """
+    from twisted.internet import reactor
+    # Module 'twisted.internet.reactor' has no 'stop' member
+    # pylint: disable=E1101
+    logger.info("Stoping Ubuntu SSO login manager since SIGHUP was received.")
+    reactor.stop()
+
+
 if __name__ == "__main__":
     # Register DBus service for making sure we run only one instance
     bus = dbus.SessionBus()
@@ -54,6 +69,9 @@
     from twisted.internet import gtk2reactor
     gtk2reactor.install()
 
+    logger.debug("Hooking up SIGHUP with handler %r.", sighup_handler)
+    signal.signal(signal.SIGHUP, sighup_handler)
+
     logger.info("Starting Ubuntu SSO login manager for bus %r.", DBUS_BUS_NAME)
     SSOLogin(dbus.service.BusName(DBUS_BUS_NAME,
                                   bus=dbus.SessionBus()))