diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-15 13:15:46 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-15 13:15:46 +0200 |
| commit | 91e85cf829250429a2437076e9e165b4a953e5ac (patch) | |
| tree | 353deae31615015eae3e11d6442cab2c8a5f1ef0 /lib/Utils | |
| parent | dd488fb6ceb80f7963b1a1a29c4b90b80977bb34 (diff) | |
| download | abrt-91e85cf829250429a2437076e9e165b4a953e5ac.tar.gz abrt-91e85cf829250429a2437076e9e165b4a953e5ac.tar.xz abrt-91e85cf829250429a2437076e9e165b4a953e5ac.zip | |
RHTSupport: actually use settings; report curl errors better
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'lib/Utils')
| -rw-r--r-- | lib/Utils/abrt_rh_support.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lib/Utils/abrt_rh_support.cpp b/lib/Utils/abrt_rh_support.cpp index 76a36119..5ff75652 100644 --- a/lib/Utils/abrt_rh_support.cpp +++ b/lib/Utils/abrt_rh_support.cpp @@ -399,14 +399,20 @@ send_report_to_new_case(const char* baseURL, /* fall through */ default: - errmsg = find_header_in_abrt_post_state(case_state, "Strata-Message:"); - if (!errmsg && case_state->body && case_state->body[0]) - errmsg = case_state->body; + errmsg = case_state->curl_error_msg; if (errmsg) - retval = xasprintf("error in case creation, server says: '%s'", errmsg); + retval = xasprintf("error in case creation: %s", errmsg); else - retval = xasprintf("error in case creation, HTTP code: %d", - case_state->http_resp_code); + { + errmsg = find_header_in_abrt_post_state(case_state, "Strata-Message:"); + if ((!errmsg || !errmsg[0]) && case_state->body && case_state->body[0]) + errmsg = case_state->body; + if (errmsg) + retval = xasprintf("error in case creation, server says: '%s'", errmsg); + else + retval = xasprintf("error in case creation, HTTP code: %d", + case_state->http_resp_code); + } break; case 200: @@ -443,7 +449,9 @@ send_report_to_new_case(const char* baseURL, default: /* Case Creation Succeeded, attachement FAILED */ errmsg = find_header_in_abrt_post_state(atch_state, "Strata-Message:"); - if (!errmsg && atch_state->body && atch_state->body[0]) + if (!errmsg || !errmsg[0]) + errmsg = atch_state->curl_error_msg; + if ((!errmsg || !errmsg[0]) && atch_state->body && atch_state->body[0]) errmsg = atch_state->body; if (case_state->body && case_state->body[0]) { |