powerel7
/
base
2
0
Fork 0
Code Issues Pull Requests Releases Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1049 Commits
1 Branch
0 Tags
390 MiB
 
 
 
 
 
 
Tree: 6441ca8477
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6441ca8477'
${ noResults }
base/SOURCES/0084-rhtsupport-check-for-h...

170 lines
6.5 KiB
Raw Blame History

From 5ff7f36c1a06f5317241b43999f4f03a21594c79 Mon Sep 17 00:00:00 2001
From: Jakub Filak <jfilak@redhat.com>
Date: Tue, 23 Sep 2014 13:54:51 +0200
Subject: [LIBREPORT PATCH 84/93] rhtsupport: check for hints only when
creating a new case
If the check for hints finds something, reporter-rhtsupport asks the
user whether he wants to continue in creating a new case. While it is a
useful feature, the reporter should ask that question only if the user
runs the reporter with option -t (create a new case).
We also want to receive as many uReports as possible, so we need to
submit uReport before checking for hints because the report might
interrupt the reporting process in case of positive hints results.
Related to rhbz#1139987
Signed-off-by: Jakub Filak <jfilak@redhat.com>
---
src/plugins/reporter-rhtsupport.c | 120 ++++++++++++++++++++------------------
1 file changed, 63 insertions(+), 57 deletions(-)
diff --git a/src/plugins/reporter-rhtsupport.c b/src/plugins/reporter-rhtsupport.c
index cd72c87..47e544d 100644
--- a/src/plugins/reporter-rhtsupport.c
+++ b/src/plugins/reporter-rhtsupport.c
@@ -215,6 +215,56 @@ char *submit_ureport(const char *dump_dir_name, struct ureport_server_config *co
}
static
+bool check_for_hints(const char *url, const char *login, const char *password, bool ssl_verify, const char *tempfile)
+{
+ rhts_result_t *result = get_rhts_hints(url, login, password, ssl_verify, tempfile);
+#if 0 /* testing */
+ log("ERR:%d", result->error);
+ log("MSG:'%s'", result->msg);
+ log("BODY:'%s'", result->body);
+ result->error = 0;
+ result->body = xstrdup(
+ "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
+ "<problems xmlns=\"http://www.redhat.com/gss/strata\">"
+ "<link uri=\"http://access.redhat.com/\" rel=\"help\">The main Red Hat Support web site</link>"
+ "<property name=\"content\">an ABRT report</property>"
+ "<problem>"
+ "<property name=\"source\">a backtrace in the ABRT report</property>"
+ "<link uri=\"https://avalon-ci.gss.redhat.com/kb/docs/DOC-22029\" rel=\"suggestion\">[RHEL 5.3] EVO autocompletion lookup hang</link>"
+ "</problem>"
+ "</problems>"
+ );
+#endif
+ if (result->error)
+ {
+ /* We don't use result->msg here because it looks like this:
+ * Error in file upload at 'URL', HTTP code: 404,
+ * server says: '<?xml...?><error...><code>404</code><message>...</message></error>'
+ * TODO: make server send bare textual msgs, not XML.
+ */
+ error_msg("Error in file upload at '%s', HTTP code: %d", url, result->http_resp_code);
+ }
+ else if (result->body)
+ {
+ /* The message might contain URLs to known solutions and such */
+ char *hint = parse_response_from_RHTS_hint_xml2txt(result->body);
+ if (hint)
+ {
+ hint = append_to_malloced_string(hint, " ");
+ hint = append_to_malloced_string(hint,
+ _("Do you still want to create a RHTSupport ticket?")
+ );
+ int create_ticket = ask_yes_no(hint);
+ free(hint);
+ if (!create_ticket)
+ return true;
+ }
+ }
+ free_rhts_result(result);
+ return false;
+}
+
+static
char *ask_rh_login(const char *message)
{
char *login = ask(message);
@@ -519,63 +569,6 @@ int main(int argc, char **argv)
off_t tempfile_size = stat_st_size_or_die(tempfile);
- if (tempfile_size <= QUERY_HINTS_IF_SMALLER_THAN)
- {
- /* Check for hints and show them if we have something */
- log(_("Checking for hints"));
- result = get_rhts_hints(base_api_url,
- login,
- password,
- ssl_verify,
- tempfile
- );
-#if 0 /* testing */
- log("ERR:%d", result->error);
- log("MSG:'%s'", result->msg);
- log("BODY:'%s'", result->body);
- result->error = 0;
- result->body = xstrdup(
- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
- "<problems xmlns=\"http://www.redhat.com/gss/strata\">"
- "<link uri=\"http://access.redhat.com/\" rel=\"help\">The main Red Hat Support web site</link>"
- "<property name=\"content\">an ABRT report</property>"
- "<problem>"
- "<property name=\"source\">a backtrace in the ABRT report</property>"
- "<link uri=\"https://avalon-ci.gss.redhat.com/kb/docs/DOC-22029\" rel=\"suggestion\">[RHEL 5.3] EVO autocompletion lookup hang</link>"
- "</problem>"
- "</problems>"
- );
-#endif
- if (result->error)
- {
- /* We don't use result->msg here because it looks like this:
- * Error in file upload at 'URL', HTTP code: 404,
- * server says: '<?xml...?><error...><code>404</code><message>...</message></error>'
- * TODO: make server send bare textual msgs, not XML.
- */
- error_msg("Error in file upload at '%s', HTTP code: %d",
- base_api_url, result->http_resp_code);
- }
- if (result->error == 0 && result->body)
- {
- /* The message might contain URLs to known solutions and such */
- char *hint = parse_response_from_RHTS_hint_xml2txt(result->body);
- if (hint)
- {
- hint = append_to_malloced_string(hint, " ");
- hint = append_to_malloced_string(hint,
- _("Do you still want to create a RHTSupport ticket?")
- );
- int create_ticket = ask_yes_no(hint);
- free(hint);
- if (!create_ticket)
- goto ret;
- }
- }
- free_rhts_result(result);
- result = NULL;
- }
-
if (!(opts & OPT_t))
{
char *bthash = NULL;
@@ -593,6 +586,19 @@ int main(int argc, char **argv)
bthash = submit_ureport(dump_dir_name, &urconf);
}
+ if (tempfile_size <= QUERY_HINTS_IF_SMALLER_THAN)
+ {
+ /* Check for hints and show them if we have something */
+ log(_("Checking for hints"));
+ if (check_for_hints(base_api_url, login, password, ssl_verify, tempfile))
+ {
+ ureport_server_config_destroy(&urconf);
+ free_map_string(ursettings);
+ free(bthash);
+ goto ret;
+ }
+ }
+
log(_("Creating a new case"));
char *product = NULL;
--
1.8.3.1