Merge lp:~mandel/ubuntu-sso-client/cannot_shutdown_windows into lp:ubuntu-sso-client

[Manuel de la Peña]

Updated the way in which the service shutsdowns. The implementation uses a LoopingCallback from twisted and does perform a correct exit which was missing in the previous code.

Updated the way in which the service shutsdowns. The implementation uses a LoopingCallback from twisted and does perform a correct exit which was missing in the previous code.

[Shane Fagan (shanepatrickfagan)]

review: Approve

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'bin/windows-ubuntu-sso-login'
--- bin/windows-ubuntu-sso-login	2011-04-13 16:36:12 +0000
+++ bin/windows-ubuntu-sso-login	2011-05-23 15:39:08 +0000
@@ -36,6 +36,7 @@
 from PyQt4.QtGui import QApplication
 from twisted.internet import reactor
 from twisted.spread.pb import PBServerFactory
+from twisted.internet.task import LoopingCall
 
 from ubuntu_sso.main.windows import (
     CredentialsManagement,
@@ -46,6 +47,18 @@
     UbuntuSSORoot)
 
 
+def add_timeout(interval, callback, *args, **kwargs):
+    """Add a timeout callback as a task."""
+    time_out_task = LoopingCall(callback, *args, **kwargs)
+    time_out_task.start(interval/1000, now=False)
+
+
+def shutdown(pipe_service):
+    """Shutdown all the running processes and threads."""
+    pipe_service.stop()
+    reactor.stop()
+
+
 if __name__ == '__main__':
     # check if the service is running by calling the named pipe, if not
     # start it.
@@ -53,12 +66,14 @@
     if port is None:
         login = SSOLogin('ignored')
         creds = SSOCredentials()
-        creds_management = CredentialsManagement(lambda:None, sys.exit)
+        username = GetUserNameEx(NameSamCompatible)
+        named_pipe_service = ListeningPortPipeService(username,
+                                                      0)
+        creds_management = CredentialsManagement(add_timeout,
+                                        lambda: shutdown(named_pipe_service))
         root = UbuntuSSORoot(login, creds, creds_management)
         listener = reactor.listenTCP(0, PBServerFactory(root))
-        username = GetUserNameEx(NameSamCompatible)
-        named_pipe_service = ListeningPortPipeService(username,
-                                                      listener.getHost().port)
+        named_pipe_service.port = listener.getHost().port
         service_thread = Thread(name='Ubuntu SSO Port Broadcaster',
                                 target=named_pipe_service.start)
         service_thread.start()