Merge lp:~ted/url-dispatcher/error-data into lp:url-dispatcher/14.10

[Ted Gould]

Improving error messages and collecting more data

Trying to track down errors in updating the URL DB, but the errors didn't tell us what was wrong. The theory is that there's no tables, but odd considering that shouldn't happen. Asking Apport to pick up the data for us.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Nice small catch with dir_search in url_db_files_for_dir(), too

review: Approve

=== modified file 'debian/rules'
--- debian/rules	2014-01-13 19:18:51 +0000
+++ debian/rules	2014-06-06 16:13:36 +0000
@@ -5,3 +5,11 @@
 
 %:
 	dh $@ --fail-missing --with click
+
+override_dh_install:
+	mkdir -p debian/url-dispatcher/usr/share/apport/package-hooks/
+	install -m 644 debian/source_url-dispatcher.py debian/url-dispatcher/usr/share/apport/package-hooks/
+	mkdir -p debian/url-dispatcher/etc/apport/crashdb.conf.d/
+	install -m 644 debian/url-dispatcher-crashdb.conf debian/url-dispatcher/etc/apport/crashdb.conf.d/
+	dh_install --fail-missing
+

=== added file 'debian/source_url-dispatcher.py'
--- debian/source_url-dispatcher.py	1970-01-01 00:00:00 +0000
+++ debian/source_url-dispatcher.py	2014-06-06 16:13:36 +0000
@@ -0,0 +1,20 @@
+import os.path
+from xdg.BaseDirectory import xdg_cache_home
+from apport.hookutils import *
+
+def attach_command_output(report, command_list, key):
+	log = command_output(command_list)
+	if not log or log[:5] == "Error":
+		return
+	report[key] = log 
+
+def add_info(report):
+	if not apport.packaging.is_distro_package(report['Package'].split()[0]):
+		report['ThirdParty'] = 'True'
+		report['CrashDB'] = 'url_dispatcher'
+
+	dbpath = os.path.join(xdg_cache_home, 'url-dispatcher', 'urls-1.db')
+	if os.path.exists(dbpath):
+		attach_command_output(report, ['sqlite3', dbpath, '.tables'], 'CacheDBTables')
+		attach_command_output(report, ['sqlite3', dbpath, 'select * from urls'], 'CacheDBURLS')
+		attach_command_output(report, ['sqlite3', dbpath, 'select * from configfiles'], 'CacheDBFiles')

=== added file 'debian/url-dispatcher-crashdb.conf'
--- debian/url-dispatcher-crashdb.conf	1970-01-01 00:00:00 +0000
+++ debian/url-dispatcher-crashdb.conf	2014-06-06 16:13:36 +0000
@@ -0,0 +1,6 @@
+
+url_dispatcher = {
+	'impl': 'launchpad',
+	'project': 'url-dispatcher',
+	'bug_pattern_base': None,
+}

=== modified file 'service/url-db.c'
--- service/url-db.c	2014-03-14 19:48:28 +0000
+++ service/url-db.c	2014-06-06 16:13:36 +0000
@@ -52,7 +52,7 @@
 
 	open_status = sqlite3_open(dbfilename, &db);
 	if (open_status != SQLITE_OK) {
-		g_warning("Unable to open URL database");
+		g_warning("Unable to open URL database: %s", sqlite3_errmsg(db));
 		g_free(dbfilename);
 		if (db != NULL) {
 			sqlite3_close(db);
@@ -96,7 +96,7 @@
 			-1, /* length */
 			&stmt,
 			NULL) != SQLITE_OK) {
-		g_warning("Unable to parse SQL to get file times");
+		g_warning("Unable to parse SQL to get file times: %s", sqlite3_errmsg(db));
 		return FALSE;
 	}
 
@@ -136,7 +136,7 @@
 			-1, /* length */
 			&stmt,
 			NULL) != SQLITE_OK) {
-		g_warning("Unable to parse SQL to set file times");
+		g_warning("Unable to parse SQL to set file times: %s", sqlite3_errmsg(db));
 		return FALSE;
 	}
 
@@ -187,7 +187,7 @@
 	sqlite3_finalize(stmt);
 
 	if (exec_status != SQLITE_DONE) {
-		g_warning("Unable to execute insert");
+		g_warning("Unable to execute insert: %s", sqlite3_errmsg(db));
 		return FALSE;
 	}
 
@@ -210,7 +210,7 @@
 			-1, /* length */
 			&stmt,
 			NULL) != SQLITE_OK) {
-		g_warning("Unable to parse SQL to find url");
+		g_warning("Unable to parse SQL to find url: %s", sqlite3_errmsg(db));
 		return NULL;
 	}
 
@@ -238,7 +238,7 @@
 	sqlite3_finalize(stmt);
 
 	if (exec_status != SQLITE_DONE) {
-		g_warning("Unable to execute insert");
+		g_warning("Unable to execute insert: %s", sqlite3_errmsg(db));
 		g_free(output);
 		return NULL;
 	}
@@ -255,18 +255,17 @@
 		dir = "";
 	}
 
+	sqlite3_stmt * stmt;
+	if (sqlite3_prepare_v2(db,
+			"select name from configfiles where name like ?1",
+			-1, /* length */
+			&stmt,
+			NULL) != SQLITE_OK) {
+		g_warning("Unable to parse SQL to find files: %s", sqlite3_errmsg(db));
+		return NULL;
+	}
+
 	gchar * dir_search = g_strdup_printf("%s%%", dir);
-
-	sqlite3_stmt * stmt;
-	if (sqlite3_prepare_v2(db,
-			"select name from configfiles where name like ?1",
-			-1, /* length */
-			&stmt,
-			NULL) != SQLITE_OK) {
-		g_warning("Unable to parse SQL to find files");
-		return NULL;
-	}
-
 	sqlite3_bind_text(stmt, 1, dir_search, -1, SQLITE_TRANSIENT);
 
 	GList * filelist = NULL;
@@ -280,7 +279,7 @@
 	g_free(dir_search);
 
 	if (exec_status != SQLITE_DONE) {
-		g_warning("Unable to execute insert");
+		g_warning("Unable to execute insert: %s", sqlite3_errmsg(db));
 		g_list_free_full(filelist, g_free);
 		return NULL;
 	}
@@ -299,7 +298,7 @@
 	/* Start a transaction so the database doesn't end up
 	   in an inconsistent state */
 	if (sqlite3_exec(db, "begin", NULL, NULL, NULL) != SQLITE_OK) {
-		g_warning("Unable to start transaction to delete");
+		g_warning("Unable to start transaction to delete: %s", sqlite3_errmsg(db));
 		return FALSE;
 	}
 
@@ -310,7 +309,7 @@
 			-1, /* length */
 			&stmt,
 			NULL) != SQLITE_OK) {
-		g_warning("Unable to parse SQL to remove urls");
+		g_warning("Unable to parse SQL to remove urls: %s", sqlite3_errmsg(db));
 		return FALSE;
 	}
 
@@ -323,7 +322,7 @@
 	sqlite3_finalize(stmt);
 
 	if (exec_status != SQLITE_DONE) {
-		g_warning("Unable to execute removal of URLs");
+		g_warning("Unable to execute removal of URLs: %s", sqlite3_errmsg(db));
 		return FALSE;
 	}
 
@@ -335,7 +334,7 @@
 			-1, /* length */
 			&stmt,
 			NULL) != SQLITE_OK) {
-		g_warning("Unable to parse SQL to remove urls");
+		g_warning("Unable to parse SQL to remove urls: %s", sqlite3_errmsg(db));
 		return FALSE;
 	}
 
@@ -348,13 +347,13 @@
 	sqlite3_finalize(stmt);
 
 	if (exec_status != SQLITE_DONE) {
-		g_warning("Unable to execute removal of file");
+		g_warning("Unable to execute removal of file: %s", sqlite3_errmsg(db));
 		return FALSE;
 	}
 
 	/* Commit the full transaction */
 	if (sqlite3_exec(db, "commit", NULL, NULL, NULL) != SQLITE_OK) {
-		g_warning("Unable to commit transaction to delete");
+		g_warning("Unable to commit transaction to delete: %s", sqlite3_errmsg(db));
 		return FALSE;
 	}