Merge lp:~robert-ancell/unity-greeter/kill-init into lp:unity-greeter

[Robert Ancell]

Correctly handle SIGTERM and quit cleanly. We were previously not stopping the signal and so not cleaning up on exit. This left an upstart process for each greeter remaining.

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1204
http://jenkins.qa.ubuntu.com/job/unity-greeter-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-trusty-armhf-ci/28

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-greeter-ci/45/rebuild

review: Approve (continuous-integration)

=== modified file 'src/menubar.vala'
--- src/menubar.vala	2014-03-26 20:59:31 +0000
+++ src/menubar.vala	2014-04-08 03:49:45 +0000
@@ -158,7 +158,7 @@
 
     private void close_pid (ref Pid pid)
     {
-        if (pid != 0)
+        if (pid > 0)
         {
             Posix.kill (pid, Posix.SIGTERM);
             int status;

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2014-04-08 01:52:27 +0000
+++ src/unity-greeter.vala	2014-04-08 03:49:45 +0000
@@ -468,7 +468,7 @@
         Environment.set_variable ("GTK_MODULES", "atk-bridge", false);
 
         Pid atspi_pid = 0;
-        Pid indicator_pid = 0;
+        Pid upstart_pid = 0;
 
         try
         {
@@ -580,7 +580,7 @@
                                      null,
                                      SpawnFlags.SEARCH_PATH,
                                      null,
-                                     out indicator_pid);
+                                     out upstart_pid);
             }
             catch (Error e)
             {
@@ -604,18 +604,24 @@
         GLib.Unix.signal_add(GLib.ProcessSignal.TERM, () => {
             debug("Got a SIGTERM");
             Gtk.main_quit();
-            return false;
+            return true;
         });
 
         debug ("Starting main loop");
         Gtk.main ();
 
-        if (indicator_pid != 0)
+        debug ("Cleaning up");
+
+        if (upstart_pid != 0)
         {
-            Posix.kill (indicator_pid, Posix.SIGTERM);
+            Posix.kill (upstart_pid, Posix.SIGTERM);
             int status;
-            Posix.waitpid (indicator_pid, out status, 0);
-            indicator_pid = 0;
+            Posix.waitpid (upstart_pid, out status, 0);
+            if (Process.if_exited (status))
+                debug ("Upstart exited with return value %d", Process.exit_status (status));
+            else
+                debug ("Upstart terminated with signal %d", Process.term_sig (status));
+            upstart_pid = 0;
         }
 
         if (atspi_pid != 0)
@@ -623,9 +629,15 @@
             Posix.kill (atspi_pid, Posix.SIGKILL);
             int status;
             Posix.waitpid (atspi_pid, out status, 0);
+            if (Process.if_exited (status))
+                debug ("AT-SPI exited with return value %d", Process.exit_status (status));
+            else
+                debug ("AT-SPI terminated with signal %d", Process.term_sig (status));
             atspi_pid = 0;
         }
 
+        debug ("Exiting");
+
         return Posix.EXIT_SUCCESS;
     }
 }