Merge lp:~ted/ubuntu-geoip/sigterm-handler into lp:ubuntu-geoip

[Ted Gould]

Adding a sigterm handler to make it so the processes exits gracefully. This make the coverage commands work.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:31
http://jenkins.qa.ubuntu.com/job/ubuntu-geoip-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-geoip-ci/./build=pbuilder,distribution=quantal,flavor=amd64/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-geoip-ci/./build=pbuilder,distribution=quantal,flavor=i386/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-geoip-ci/./build=pbuilder,distribution=raring,flavor=amd64/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-geoip-ci/./build=pbuilder,distribution=raring,flavor=i386/1/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/ubuntu-geoip-ci/1//rebuild/?

review: Approve (continuous-integration)

=== modified file 'src/ubuntu-geoip-provider.c'
--- src/ubuntu-geoip-provider.c	2012-10-15 13:51:35 +0000
+++ src/ubuntu-geoip-provider.c	2012-11-27 20:55:27 +0000
@@ -1021,6 +1021,14 @@
 	return;
 }
 
+static void
+sigterm_graceful_exit (int signal)
+{
+	g_warning("SIGTERM recieved");
+	g_main_loop_quit(mainloop);
+	return;
+}
+
 static GOptionEntry general_options[] = {
 	{"test-data",  0,  0,  G_OPTION_ARG_FILENAME,  &test_data,  "Path to test data to use instead of getting it from the network", "XML Data File"},
 	{NULL}
@@ -1050,6 +1058,8 @@
 
 	mainloop = g_main_loop_new(NULL, TRUE);
 
+	signal(SIGTERM, sigterm_graceful_exit);
+
 	g_main_loop_run(mainloop);
 
 	g_main_loop_unref(mainloop);