Merge lp:~toykeeper/whoopsie/uploaded-url into lp:whoopsie

[Selene ToyKeeper]

Fix bug 1582470 (should put OOPS ID / URL in .uploaded file)

Intended to make it easier for both scripts and humans to map crash dump files to OOPS IDs and errors.ubuntu.com URLs, by storing that data in the .uploaded file created after a successful upload.

To test, force a crash, wait for whoopsie upload (or do a whoopsie-upload-all), then ensure the OOPS ID and URL are in the matching .uploaded file.

[Selene ToyKeeper (toykeeper)]

Not actually ready yet; I still need to build it, test it, get feedback on how to properly implement it, then possibly rewrite it.

[lp:~toykeeper/whoopsie/uploaded-url]

681. By Selene ToyKeeper on 2016-05-17

oops, use fprintf() instead of write()

[Brian Murray (brian-murray)]

I've added a comment about hard coding errors.ubuntu.com.

[Brian Murray (brian-murray)]

There were quite a few issues with this branch as implemented but I went ahead and used it as a basis for adding this functionality to whoopsie so thanks!

review: Disapprove

=== modified file 'src/monitor.c'
--- src/monitor.c	2014-07-22 23:13:35 +0000
+++ src/monitor.c	2016-05-17 03:09:42 +0000
@@ -46,12 +46,12 @@
     if (already_handled_report (crash_file)) {
         /* Ensure that if we ended up here because of an error, that we do not
          * attempt to process this report again. */
-        if (!mark_handled (crash_file))
+        if (!mark_handled (crash_file, NULL))
             log_msg ("Unable to mark report as seen (%s).\n", crash_file);
 
     } else if (callback (crash_file)) {
         /* We successfully uploaded the report */
-        if (!mark_handled (crash_file))
+        if (!mark_handled (crash_file, last_uploaded_oopsid))
             log_msg ("Unable to mark report as seen (%s).\n", crash_file);
     }
 

=== modified file 'src/tests/test_utils.c'
--- src/tests/test_utils.c	2013-08-06 14:44:19 +0000
+++ src/tests/test_utils.c	2016-05-17 03:09:42 +0000
@@ -186,7 +186,7 @@
     mktemp (template);
     crash_file = g_strdup_printf ("%s.crash", template);
     uploaded_file = g_strdup_printf ("%s.uploaded", template);
-    if (!mark_handled (crash_file)) {
+    if (!mark_handled (crash_file), NULL) {
         g_test_fail ();
         goto out;
     }

=== modified file 'src/utils.c'
--- src/utils.c	2013-08-06 14:44:19 +0000
+++ src/utils.c	2016-05-17 03:09:42 +0000
@@ -141,7 +141,7 @@
 }
 
 gboolean
-mark_handled (const char* crash_file)
+mark_handled (const char* crash_file, char * oops_id)
 {
     char* uploaded_file = NULL;
     int fd;
@@ -158,6 +158,10 @@
     if (fd < 0)
         return FALSE;
     else {
+        if (oops_id) {
+            fprintf (fd, "OOPS ID: %s\n", oops_id);
+            fprintf (fd, "URL: https://errors.ubuntu.com/oops/%s\n", oops_id);
+        }
         close (fd);
         return TRUE;
     }

=== modified file 'src/utils.h'
--- src/utils.h	2013-08-06 14:44:19 +0000
+++ src/utils.h	2016-05-17 03:09:42 +0000
@@ -26,7 +26,7 @@
 
 char* change_file_extension (const char* path, const char* extension);
 gboolean already_handled_report (const char* crash_file);
-gboolean mark_handled (const char* crash_file);
+gboolean mark_handled (const char* crash_file, char * oops_id);
 void init_response_string (struct response_string* resp);
 void grow_response_string (struct response_string* resp, char* str, size_t length);
 void destroy_response_string (struct response_string* resp);

=== modified file 'src/whoopsie.c'
--- src/whoopsie.c	2016-03-17 20:25:35 +0000
+++ src/whoopsie.c	2016-05-17 03:09:42 +0000
@@ -73,6 +73,9 @@
 /* The URL for sending the initial crash report */
 static char* crash_db_submit_url = NULL;
 
+/* OOPS ID of the last successfully-uploaded crash file */
+char* last_uploaded_oopsid = NULL;
+
 /* The file path and descriptor for our instance lock */
 static const char* lock_path = "/var/lock/whoopsie/lock";
 static int lock_fd = 0;
@@ -596,6 +599,7 @@
     if (command) {
         if (strcmp (command, "CORE") == 0) {
             log_msg ("Reported OOPS ID %.36s\n", response_data);
+            set_last_uploaded_oopsid(response_data);
             core = g_hash_table_lookup (report, "CoreDump");
             arch = g_hash_table_lookup (report, "Architecture");
             if (core && arch) {
@@ -606,10 +610,12 @@
                     log_msg ("Upload of the core dump failed.\n");
             } else if (strcmp (command, "OOPSID") == 0) {
                 log_msg ("Reported OOPS ID %.36s\n", response_data);
+                set_last_uploaded_oopsid(response_data);
             } else
                 log_msg ("Asked for a core dump that we don't have.\n");
         } else if (strcmp (command, "OOPSID") == 0) {
             log_msg ("Reported OOPS ID %.36s\n", response_data);
+            set_last_uploaded_oopsid(response_data);
         } else
             log_msg ("Got command: %s\n", command);
     }
@@ -668,8 +674,10 @@
             log_msg ("%s\n", s.p);
         }
 
-        if (response == 200 && s.length > 0)
+        if (response == 200 && s.length > 0) {
+            unset_last_uploaded_oopsid();
             handle_response (report, s.p);
+        }
         destroy_response_string (&s);
     }
 
@@ -712,7 +720,7 @@
             g_free (crash_file);
             continue;
         } else if (online_state && parse_and_upload_report (crash_file)) {
-            if (!mark_handled (crash_file))
+            if (!mark_handled (crash_file, last_uploaded_oopsid))
                 log_msg ("Unable to mark report as seen (%s) removing it.\n", crash_file);
                 g_unlink (crash_file);
         }
@@ -725,6 +733,20 @@
     return G_SOURCE_CONTINUE;
 }
 
+void set_last_uploaded_oopsid (char * response)
+{
+    unset_last_uploaded_oopsid();
+    last_uploaded_oopsid = g_strdup_printf ("%.36s", response);
+}
+
+void unset_last_uploaded_oopsid ()
+{
+    if (last_uploaded_oopsid) {
+        g_free (last_uploaded_oopsid);
+        last_uploaded_oopsid = NULL;
+    }
+}
+
 void daemonize (void)
 {
     pid_t pid, sid;

=== modified file 'src/whoopsie.h'
--- src/whoopsie.h	2013-08-06 14:44:19 +0000
+++ src/whoopsie.h	2016-05-17 03:09:42 +0000
@@ -25,5 +25,6 @@
 void destroy_key_and_value (gpointer key, gpointer value, gpointer user_data);
 void drop_privileges (GError** error);
 gboolean process_existing_files (const char* report_dir);
+char* last_uploaded_oopsid;
 
 #endif /* WHOOPSIE_H */