From: Jeff Trawick <trawick@apache.org>
Date: Thu, 13 Jan 2005 19:01:19 +0000 (+0000)
Subject: pretty up some error log messages; include useful info
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f611a09378054821d7b1d99c0a0071276e9a7fd1;p=thirdparty%2Fapache%2Fhttpd.git

pretty up some error log messages; include useful info
such as directory name and file name


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/proxy-reqbody@125089 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index d686dab1c96..e3b7f8f2ae3 100644
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -546,7 +546,7 @@ static apr_status_t spool_reqbody_cl(apr_pool_t *p,
                 status = apr_temp_dir_get(&temp_dir, p);
                 if (status != APR_SUCCESS) {
                     ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
-                                 "proxy: request data temp directory search failed");
+                                 "proxy: search for temporary directory failed");
                     return status;
                 }
                 apr_filepath_merge(&template, temp_dir,
@@ -555,7 +555,8 @@ static apr_status_t spool_reqbody_cl(apr_pool_t *p,
                 status = apr_file_mktemp(&tmpfile, template, 0, p);
                 if (status != APR_SUCCESS) {
                     ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
-                                 "proxy: request data tmp file creation failed");
+                                 "proxy: creation of temporary file in directory %s failed",
+                                 temp_dir);
                     return status;
                 }
             }
@@ -568,8 +569,14 @@ static apr_status_t spool_reqbody_cl(apr_pool_t *p,
                 apr_bucket_read(e, &data, &bytes_read, APR_BLOCK_READ);
                 status = apr_file_write_full(tmpfile, data, bytes_read, &bytes_written);
                 if (status != APR_SUCCESS) {
+                    const char *tmpfile_name;
+
+                    if (apr_file_name_get(&tmpfile_name, tmpfile) != APR_SUCCESS) {
+                        tmpfile_name = "(unknown)";
+                    }
                     ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
-                                 "proxy: request data tmp file I/O failed");
+                                 "proxy: write to temporary file %s failed",
+                                 tmpfile_name);
                     return status;
                 }
                 AP_DEBUG_ASSERT(bytes_read == bytes_written);