global: Use http_response_get_message() to log HTTP responses.

diff --git a/src/auth/auth-policy.c b/src/auth/auth-policy.c
index b7899af3a64aead4048fb158dd01992a0247587b..e2f3c932107169c7e1ed0174ab6fd5df40cafa22 100755 (executable)
--- a/src/auth/auth-policy.c
+++ b/src/auth/auth-policy.c
@@ -340,7 +340,8 @@ void auth_policy_process_response(const struct http_response *response,
 
        if ((response->status / 10) != 20) {
                auth_request_log_error(context->request, "policy",
-                       "Policy server HTTP error: %d %s", response->status, response->reason);
+                       "Policy server HTTP error: %s",
+                       http_response_get_message(response));
                if (context->callback != NULL)
                        context->callback(context->result, context->callback_context);
                return;

diff --git a/src/lib-http/http-client-connection.c b/src/lib-http/http-client-connection.c
index a703339ab3f39444f9de507ff91554d47d7b0ac2..92301ed0b80307380e385388635f1314dd8f8269 100644 (file)
--- a/src/lib-http/http-client-connection.c
+++ b/src/lib-http/http-client-connection.c
@@ -1387,8 +1387,8 @@ http_client_connection_tunnel_response(const struct http_response *response,
 
        if (response->status != 200) {
                http_client_connection_failure(conn, t_strdup_printf(
-                       "Tunnel connect(%s) failed: %d %s", name,
-                               response->status, response->reason));
+                       "Tunnel connect(%s) failed: %s", name,
+                               http_response_get_message(response)));
                return;
        }
 

diff --git a/src/plugins/fts-solr/solr-connection.c b/src/plugins/fts-solr/solr-connection.c
index c2ba2270cdc2f326d847210c76dfe3c1774815a8..aaedd3d880e7920b25a556aacee9a38bd6c258bd 100644 (file)
--- a/src/plugins/fts-solr/solr-connection.c
+++ b/src/plugins/fts-solr/solr-connection.c
@@ -408,8 +408,8 @@ solr_connection_select_response(const struct http_response *response,
                                struct solr_connection *conn)
 {
        if (response->status / 100 != 2) {
-               i_error("fts_solr: Lookup failed: %u %s",
-                       response->status, response->reason);
+               i_error("fts_solr: Lookup failed: %s",
+                       http_response_get_message(response));
                conn->request_status = -1;
                return;
        }
@@ -481,8 +481,8 @@ solr_connection_update_response(const struct http_response *response,
                                struct solr_connection *conn)
 {
        if (response->status / 100 != 2) {
-               i_error("fts_solr: Indexing failed: %u %s",
-                       response->status, response->reason);
+               i_error("fts_solr: Indexing failed: %s",
+                       http_response_get_message(response));
                conn->request_status = -1;
        }
 }

diff --git a/src/plugins/fts/fts-parser-tika.c b/src/plugins/fts/fts-parser-tika.c
index 7f9442eeaed7b097371e6313aa5c76fe6a199c36..e1888c06fe30e83d43015fa3bfd7e90048b4bf11 100644 (file)
--- a/src/plugins/fts/fts-parser-tika.c
+++ b/src/plugins/fts/fts-parser-tika.c
@@ -97,9 +97,9 @@ fts_tika_parser_response(const struct http_response *response,
        case 415: /* Unsupported Media Type */
        case 422: /* Unprocessable Entity */
                if (parser->user->mail_debug) {
-                       i_debug("fts_tika: PUT %s failed: %u %s",
+                       i_debug("fts_tika: PUT %s failed: %s",
                                mail_user_plugin_getenv(parser->user, "fts_tika"),
-                               response->status, response->reason);
+                               http_response_get_message(response));
                }
                parser->payload = i_stream_create_from_data("", 0);
                break;
@@ -114,16 +114,16 @@ fts_tika_parser_response(const struct http_response *response,
                   isn't available anymore here. So we'd need to indicate
                   in fts_parser_deinit() that we want to retry.
                   FIXME: do this in v2.3. For now we'll just ignore it. */
-               i_info("fts_tika: PUT %s failed: %u %s - ignoring",
+               i_info("fts_tika: PUT %s failed: %s - ignoring",
                       mail_user_plugin_getenv(parser->user, "fts_tika"),
-                      response->status, response->reason);
+                      http_response_get_message(response));
                parser->payload = i_stream_create_from_data("", 0);
                break;
 
        default:
-               i_error("fts_tika: PUT %s failed: %u %s",
+               i_error("fts_tika: PUT %s failed: %s",
                        mail_user_plugin_getenv(parser->user, "fts_tika"),
-                       response->status, response->reason);
+                       http_response_get_message(response));
                parser->failed = TRUE;
                break;
        }

diff --git a/src/plugins/push-notification/push-notification-driver-ox.c b/src/plugins/push-notification/push-notification-driver-ox.c
index fb152141f5435d4c9f0d5ff4638281053f54108f..065a3af238c2871efd722458cef18a8dfe9d7635 100644 (file)
--- a/src/plugins/push-notification/push-notification-driver-ox.c
+++ b/src/plugins/push-notification/push-notification-driver-ox.c
@@ -295,15 +295,15 @@ static void push_notification_driver_ox_http_callback
         // Success.
        if (user->mail_debug) {
             push_notification_driver_debug(OX_LOG_LABEL, user,
-                                           "Notification sent successfully: %u %s",
-                                           response->status, response->reason);
+                                           "Notification sent successfully: %s",
+                                           http_response_get_message(response));
        }
         break;
 
     default:
         // Error.
-        i_error(OX_LOG_LABEL "Error when sending notification: %u %s",
-                response->status, response->reason);
+        i_error(OX_LOG_LABEL "Error when sending notification: %s",
+                http_response_get_message(response));
         break;
     }
 }