Merge lp:~ken-vandine/address-book-app/graceful_quit into lp:address-book-app

[Ken VanDine]

Gracefully quit on SIGTERM, SIGHUP, SIGKILL, and SIGINT

Gracefully quit on SIGTERM, SIGHUP, SIGKILL, and SIGINT

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:403
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/788/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/91
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1878
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/746
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1876
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1876/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19006
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/601
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/881
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/881/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/788/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:403
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/789/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/92
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1881
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/747
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1658
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1879
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1879/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/882
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/882/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/789/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

looks good. Thanks

review: Approve

Unmerged revisions

403. By Ken VanDine on 2015-03-19

Gracefully quit on SIGTERM, SIGHUP, SIGKILL, and SIGINT

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-02-18 14:09:02 +0000
+++ src/app/main.cpp	2015-03-19 18:03:41 +0000
@@ -17,9 +17,17 @@
 #include "config.h"
 #include "addressbookapp.h"
 
+#include <csignal>
 // Qt
 #include <QCoreApplication>
 
+namespace {
+    void shutdown(int sig)
+    {
+        QCoreApplication::instance()->quit();
+    }
+}
+
 int main(int argc, char** argv)
 {
     QCoreApplication::setOrganizationName("Canonical");
@@ -32,6 +40,11 @@
         return 0;
     }
 
+    std::signal(SIGTERM, shutdown);
+    std::signal(SIGHUP, shutdown);
+    std::signal(SIGKILL, shutdown);
+    std::signal(SIGINT, shutdown);
+
     return application.exec();
 }