Merge lp:~ted/url-dispatcher/recoverable-inserts into lp:url-dispatcher/14.10

[Ted Gould]

Recoverable errors on DB errors on update

Add some recoverable errors

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:54
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/112/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-armhf-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-i386-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/url-dispatcher-ci/112/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/url-dispatcher/recoverable-inserts]

55. By Ted Gould on 2014-06-04

Update to trunk

56. By Ted Gould on 2014-06-04

Const our strings

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/url-dispatcher-ci/113/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

The patch looks fine; approving.

As an aside, a couple of things stand out to me when reading this:

1. The scaffolding for building the key/value pairs is kind of clumsy. When we create a 'standard' version of recoverable errors and remove the copied files from the various projects, maybe report_recoverable_problem() should end in a ... with an __attribute__ ((__sentinel__)) in the prototype.

2. I'm surprised I hadn't noticed this before, but "motification"? :-)

review: Approve

=== modified file 'service/dispatcher.c'
--- service/dispatcher.c	2014-05-26 12:56:47 +0000
+++ service/dispatcher.c	2014-06-04 16:03:47 +0000
@@ -72,7 +72,7 @@
 	g_variant_unref(pid_tuple);
 
 	gchar * signature = g_strdup_printf("url-dispatcher;bad-url;%s", badurl);
-	gchar * additional[3] = {
+	const gchar * additional[3] = {
 		"BadURL",
 		badurl,
 		NULL

=== modified file 'service/recoverable-problem.c'
--- service/recoverable-problem.c	2013-09-19 17:01:34 +0000
+++ service/recoverable-problem.c	2014-06-04 16:03:47 +0000
@@ -61,7 +61,7 @@
 
 /* Code to report an error */
 void
-report_recoverable_problem (const gchar * signature, GPid report_pid, gboolean wait, gchar * additional_properties[])
+report_recoverable_problem (const gchar * signature, GPid report_pid, gboolean wait, const gchar * additional_properties[])
 {
 	GError * error = NULL;
 	gint error_stdin = 0;

=== modified file 'service/recoverable-problem.h'
--- service/recoverable-problem.h	2013-09-16 20:56:28 +0000
+++ service/recoverable-problem.h	2014-06-04 16:03:47 +0000
@@ -22,5 +22,5 @@
 void    report_recoverable_problem    (const gchar *   signature,
                                        GPid            report_pid,
                                        gboolean        wait,
-                                       gchar *         additional_properties[]);
+                                       const gchar *   additional_properties[]);
 

=== modified file 'service/update-directory.c'
--- service/update-directory.c	2014-03-14 19:47:07 +0000
+++ service/update-directory.c	2014-06-04 16:03:47 +0000
@@ -55,7 +55,22 @@
 		return;
 	}
 
-	url_db_insert_url(urldata->db, urldata->filename, protocol, suffix);
+	if (!url_db_insert_url(urldata->db, urldata->filename, protocol, suffix)) {
+		const gchar * additional[7] = {
+			"Filename",
+			NULL,
+			"Protocol",
+			NULL,
+			"Suffix",
+			NULL,
+			NULL
+		};
+		additional[1] = urldata->filename;
+		additional[3] = protocol;
+		additional[5] = suffix;
+
+		report_recoverable_problem("url-dispatcher-update-sqlite-insert-error", 0, TRUE, additional);
+	}
 }
 
 static void
@@ -115,7 +130,17 @@
 		}
 	}
 
-	url_db_set_file_motification_time(db, filename, &filetime);
+	if (!url_db_set_file_motification_time(db, filename, &filetime)) {
+		const gchar * additional[7] = {
+			"Filename",
+			NULL,
+			NULL
+		};
+		additional[1] = filename;
+
+		report_recoverable_problem("url-dispatcher-update-sqlite-fileupdate-error", 0, TRUE, additional);
+		return FALSE;
+	}
 
 	return TRUE;
 }
@@ -128,6 +153,14 @@
 	g_debug("  Removing file: %s", filename);
 	if (!url_db_remove_file((sqlite3*)user_data, filename)) {
 		g_warning("Unable to remove file: %s", filename);
+		const gchar * additional[3] = {
+			"Filename",
+			NULL,
+			NULL
+		};
+		additional[1] = filename;
+
+		report_recoverable_problem("url-dispatcher-update-remove-file-error", 0, TRUE, additional);
 	}
 }
 
@@ -198,7 +231,7 @@
 
 	int close_status = sqlite3_close(db);
 	if (close_status != SQLITE_OK) {
-		gchar * additional[3] = {
+		const gchar * additional[3] = {
 			"SQLiteStatus",
 			NULL,
 			NULL

=== modified file 'tests/recoverable-problem-mock.c'
--- tests/recoverable-problem-mock.c	2013-09-26 15:27:55 +0000
+++ tests/recoverable-problem-mock.c	2014-06-04 16:03:47 +0000
@@ -21,7 +21,7 @@
 #include "recoverable-problem.h"
 
 void
-report_recoverable_problem (const gchar * signature, GPid report_pid, gboolean wait, gchar * additional_properties[])
+report_recoverable_problem (const gchar * signature, GPid report_pid, gboolean wait, const gchar * additional_properties[])
 {
 
 	return;