commit e1b21e95d366380aa5284824a250256df6bbd721
author Michael Krebs <mkrebs@chromium.org> Wed Apr 04 20:14:11 2012 -0700
committer Gerrit <chrome-bot@google.com> Wed Apr 11 12:57:51 2012 -0700
tree 2f39dff8d1d0975d842bb072f56b17bdf67c0ab2
parent fff57dbc2e0e1b60606245f52aedd20df7dd49e2

crash-reporter: Send "error_type" field for crash-reporter errors

If the "error_type" field was set by crash_reporter (see benchan@'s
https://gerrit.chromium.org/gerrit/17166), then send it with the crash
report.  This currently only affects crashes with the
"crash_reporter-user-collection" error signature.

BUG=chromium-os:7871
TEST=Manually ran crash_sender

Change-Id: I34c5e055efb407d57a3f83b07e8d4fc0a6b8fac1
Reviewed-on: https://gerrit.chromium.org/gerrit/19641
Tested-by: Michael Krebs <mkrebs@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Ready: Michael Krebs <mkrebs@chromium.org>

crash_reporter/crash_sender

diff --git a/crash_reporter/crash_sender b/crash_reporter/crash_sender
index a7a2fc4..4b8473b 100644
--- a/crash_reporter/crash_sender
+++ b/crash_reporter/crash_sender
@@ -233,6 +233,12 @@
     extra_value1="@${log}"
   fi
 
+  local error_type="$(get_key_value "${meta_path}" "error_type")"
+  if [ "${error_type}" != "undefined" ]; then
+    extra_key3="error_type"
+    extra_value3="${error_type}"
+  fi
+
   lecho "Sending crash:"
   lecho "  Scheduled to send in ${sleep_time}s"
   lecho "  Metadata: ${meta_path} (${kind})"
@@ -245,6 +251,9 @@
     lecho "  HWClass: ${hwclass}"
     lecho "  ${extra_key1}: ${extra_value1}"
     lecho "  ${extra_key2}: ${extra_value2}"
+    if [ -n "${extra_key3}" ]; then
+      lecho "  ${extra_key3}: ${extra_value3}"
+    fi
   fi
   lecho "  Exec name: ${exec_name}"
   if is_mock; then
@@ -284,6 +293,7 @@
     -F "exec_name=${exec_name}" \
     -F "${extra_key1}=${extra_value1}" \
     -F "${extra_key2}=${extra_value2}" \
+    ${extra_key3:+-F "${extra_key3}=${extra_value3}"} \
     -F "guid=<${CONSENT_ID}" -o "${report_id}" 2>"${curl_stderr}"
   curl_result=$?
   set -e