Rename disk_cache to cache_disk within logging statements.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1037247 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/cache/mod_cache_disk.c b/modules/cache/mod_cache_disk.c
index 95216bcd473f27a110a27185b3901e2f175e1957..ca07138d3ea3b658ff1e232191f9f99d3052a97c 100644 (file)
--- a/modules/cache/mod_cache_disk.c
+++ b/modules/cache/mod_cache_disk.c
@@ -28,7 +28,7 @@
 #include "util_charset.h"
 
 /*
- * mod_disk_cache: Disk Based HTTP 1.1 Cache.
+ * mod_cache_disk: Disk Based HTTP 1.1 Cache.
  *
  * Flow to Find the .data file:
  *   Incoming client requests URI /foo/bar/baz
@@ -174,7 +174,7 @@ static apr_status_t file_cache_el_final(disk_cache_conf *conf, disk_cache_file_t
         rv = safe_file_rename(conf, file->tempfile, file->file, file->pool);
         if (rv != APR_SUCCESS) {
             ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
-                    "disk_cache: rename tempfile to file failed:"
+                    "cache_disk: rename tempfile to file failed:"
                     " %s -> %s", file->tempfile, file->file);
             apr_file_remove(file->tempfile, file->pool);
         }
@@ -351,7 +351,7 @@ static int create_entity(cache_handle_t *h, request_rec *r, const char *key, apr
     /* we don't support caching of range requests (yet) */
     if (r->status == HTTP_PARTIAL_CONTENT) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                "disk_cache: URL %s partial content response not cached",
+                "cache_disk: URL %s partial content response not cached",
                 key);
         return DECLINED;
     }
@@ -359,14 +359,14 @@ static int create_entity(cache_handle_t *h, request_rec *r, const char *key, apr
     /* Note, len is -1 if unknown so don't trust it too hard */
     if (len > dconf->maxfs) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                "disk_cache: URL %s failed the size check "
+                "cache_disk: URL %s failed the size check "
                 "(%" APR_OFF_T_FMT " > %" APR_OFF_T_FMT ")",
                 key, len, dconf->maxfs);
         return DECLINED;
     }
     if (len >= 0 && len < dconf->minfs) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                "disk_cache: URL %s failed the size check "
+                "cache_disk: URL %s failed the size check "
                 "(%" APR_OFF_T_FMT " < %" APR_OFF_T_FMT ")",
                 key, len, dconf->minfs);
         return DECLINED;
@@ -426,7 +426,7 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
         if (!error_logged) {
             error_logged = 1;
             ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                    "disk_cache: Cannot cache files to disk without a CacheRoot specified.");
+                    "cache_disk: Cannot cache files to disk without a CacheRoot specified.");
         }
         return DECLINED;
     }
@@ -466,7 +466,7 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
         rc = read_array(r, varray, dobj->vary.fd);
         if (rc != APR_SUCCESS) {
             ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
-                    "disk_cache: Cannot parse vary header file: %s",
+                    "cache_disk: Cannot parse vary header file: %s",
                     dobj->vary.file);
             apr_file_close(dobj->vary.fd);
             return DECLINED;
@@ -487,7 +487,7 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
     }
     else if (format != DISK_FORMAT_VERSION) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                "disk_cache: File '%s' has a version mismatch. File had version: %d.",
+                "cache_disk: File '%s' has a version mismatch. File had version: %d.",
                 dobj->vary.file, format);
         apr_file_close(dobj->vary.fd);
         return DECLINED;
@@ -523,7 +523,7 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
     rc = file_cache_recall_mydata(dobj->hdrs.fd, info, dobj, r);
     if (rc != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
-                "disk_cache: Cannot read header file %s", dobj->hdrs.file);
+                "cache_disk: Cannot read header file %s", dobj->hdrs.file);
         apr_file_close(dobj->hdrs.fd);
         return DECLINED;
     }
@@ -533,7 +533,7 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
     /* Is this a cached HEAD request? */
     if (dobj->disk_info.header_only && !r->header_only) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r,
-                "disk_cache: HEAD request cached, non-HEAD requested, ignoring: %s",
+                "cache_disk: HEAD request cached, non-HEAD requested, ignoring: %s",
                 dobj->hdrs.file);
         return DECLINED;
     }
@@ -551,7 +551,7 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
         rc = apr_file_open(&dobj->data.fd, dobj->data.file, flags, 0, r->pool);
         if (rc != APR_SUCCESS) {
             ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
-                    "disk_cache: Cannot open data file %s", dobj->data.file);
+                    "cache_disk: Cannot open data file %s", dobj->data.file);
             apr_file_close(dobj->hdrs.fd);
             return DECLINED;
         }
@@ -568,7 +568,7 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
 
             /* Initialize the cache_handle callback functions */
             ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                    "disk_cache: Recalled cached URL info header %s", dobj->name);
+                    "cache_disk: Recalled cached URL info header %s", dobj->name);
 
             return OK;
         }
@@ -580,7 +580,7 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *key)
 
     /* Oh dear, no luck matching header to the body */
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-            "disk_cache: Cached URL info header '%s' didn't match body, ignoring this entry",
+            "cache_disk: Cached URL info header '%s' didn't match body, ignoring this entry",
             dobj->name);
 
     return DECLINED;
@@ -607,7 +607,7 @@ static int remove_url(cache_handle_t *h, request_rec *r)
     /* Delete headers file */
     if (dobj->hdrs.file) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                "disk_cache: Deleting %s from cache.", dobj->hdrs.file);
+                "cache_disk: Deleting %s from cache.", dobj->hdrs.file);
 
         rc = apr_file_remove(dobj->hdrs.file, r->pool);
         if ((rc != APR_SUCCESS) && !APR_STATUS_IS_ENOENT(rc)) {
@@ -615,7 +615,7 @@ static int remove_url(cache_handle_t *h, request_rec *r)
              * For reason see log_error_core for the case s == NULL.
              */
             ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rc, r,
-                    "disk_cache: Failed to delete headers file %s from cache.",
+                    "cache_disk: Failed to delete headers file %s from cache.",
                     dobj->hdrs.file);
             return DECLINED;
         }
@@ -624,7 +624,7 @@ static int remove_url(cache_handle_t *h, request_rec *r)
     /* Delete data file */
     if (dobj->data.file) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                "disk_cache: Deleting %s from cache.", dobj->data.file);
+                "cache_disk: Deleting %s from cache.", dobj->data.file);
 
         rc = apr_file_remove(dobj->data.file, r->pool);
         if ((rc != APR_SUCCESS) && !APR_STATUS_IS_ENOENT(rc)) {
@@ -632,7 +632,7 @@ static int remove_url(cache_handle_t *h, request_rec *r)
              * For reason see log_error_core for the case s == NULL.
              */
             ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rc, r,
-                    "disk_cache: Failed to delete data file %s from cache.",
+                    "cache_disk: Failed to delete data file %s from cache.",
                     dobj->data.file);
             return DECLINED;
         }
@@ -664,7 +664,7 @@ static int remove_url(cache_handle_t *h, request_rec *r)
              */
             for (q = dir + dobj->root_len; *q ; ) {
                  ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                        "disk_cache: Deleting directory %s from cache",
+                        "cache_disk: Deleting directory %s from cache",
                         dir);
 
                  rc = apr_dir_remove(dir, r->pool);
@@ -842,7 +842,7 @@ static apr_status_t recall_headers(cache_handle_t *h, request_rec *r)
     /* This case should not happen... */
     if (!dobj->hdrs.fd) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                "disk_cache: recalling headers; but no header fd for %s", dobj->name);
+                "cache_disk: recalling headers; but no header fd for %s", dobj->name);
         return APR_NOTFOUND;
     }
 
@@ -856,7 +856,7 @@ static apr_status_t recall_headers(cache_handle_t *h, request_rec *r)
     apr_file_close(dobj->hdrs.fd);
 
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-            "disk_cache: Recalled headers for URL %s", dobj->name);
+            "cache_disk: Recalled headers for URL %s", dobj->name);
     return APR_SUCCESS;
 }
 
@@ -961,7 +961,7 @@ static apr_status_t write_headers(cache_handle_t *h, request_rec *r)
 
             if (rv != APR_SUCCESS) {
                 ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
-                        "disk_cache: could not create temp file %s",
+                        "cache_disk: could not create temp file %s",
                         dobj->vary.tempfile);
                 return rv;
             }
@@ -994,7 +994,7 @@ static apr_status_t write_headers(cache_handle_t *h, request_rec *r)
 
     if (rv != APR_SUCCESS) {
        ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
-                "disk_cache: could not create temp file %s",
+                "cache_disk: could not create temp file %s",
                 dobj->hdrs.tempfile);
         return rv;
     }
@@ -1023,7 +1023,7 @@ static apr_status_t write_headers(cache_handle_t *h, request_rec *r)
     rv = apr_file_writev(dobj->hdrs.tempfd, (const struct iovec *) &iov, 2, &amt);
     if (rv != APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
-                "disk_cache: could not write info to header file %s",
+                "cache_disk: could not write info to header file %s",
                 dobj->hdrs.tempfile);
         apr_file_close(dobj->hdrs.tempfd);
         return rv;
@@ -1033,7 +1033,7 @@ static apr_status_t write_headers(cache_handle_t *h, request_rec *r)
         rv = store_table(dobj->hdrs.tempfd, dobj->headers_out);
         if (rv != APR_SUCCESS) {
             ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
-                    "disk_cache: could not write out-headers to header file %s",
+                    "cache_disk: could not write out-headers to header file %s",
                     dobj->hdrs.tempfile);
             apr_file_close(dobj->hdrs.tempfd);
             return rv;
@@ -1046,7 +1046,7 @@ static apr_status_t write_headers(cache_handle_t *h, request_rec *r)
         rv = store_table(dobj->hdrs.tempfd, dobj->headers_in);
         if (rv != APR_SUCCESS) {
             ap_log_rerror(APLOG_MARK, APLOG_WARNING, rv, r,
-                    "disk_cache: could not write in-headers to header file %s",
+                    "cache_disk: could not write in-headers to header file %s",
                     dobj->hdrs.tempfile);
             apr_file_close(dobj->hdrs.tempfd);
             return rv;
@@ -1125,7 +1125,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,
         APR_BRIGADE_INSERT_TAIL(dobj->bb, e);
         if (rv != APR_SUCCESS) {
             ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                    "disk_cache: Error when reading bucket for URL %s",
+                    "cache_disk: Error when reading bucket for URL %s",
                     h->cache_obj->key);
             /* Remove the intermediate cache file and return non-APR_SUCCESS */
             apr_pool_destroy(dobj->data.pool);
@@ -1168,7 +1168,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,
         rv = apr_file_write_full(dobj->data.tempfd, str, length, &written);
         if (rv != APR_SUCCESS) {
             ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                    "disk_cache: Error when writing cache file for URL %s",
+                    "cache_disk: Error when writing cache file for URL %s",
                     h->cache_obj->key);
             /* Remove the intermediate cache file and return non-APR_SUCCESS */
             apr_pool_destroy(dobj->data.pool);
@@ -1178,7 +1178,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,
         dobj->file_size += written;
         if (dobj->file_size > dconf->maxfs) {
             ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                    "disk_cache: URL %s failed the size check "
+                    "cache_disk: URL %s failed the size check "
                     "(%" APR_OFF_T_FMT ">%" APR_OFF_T_FMT ")",
                     h->cache_obj->key, dobj->file_size, dconf->maxfs);
             /* Remove the intermediate cache file and return non-APR_SUCCESS */
@@ -1218,7 +1218,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,
 
         if (r->connection->aborted || r->no_cache) {
             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
-                    "disk_cache: Discarding body for URL %s "
+                    "cache_disk: Discarding body for URL %s "
                     "because connection has been aborted.",
                     h->cache_obj->key);
             /* Remove the intermediate cache file and return non-APR_SUCCESS */
@@ -1227,7 +1227,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,
         }
         if (dobj->file_size < dconf->minfs) {
             ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                    "disk_cache: URL %s failed the size check "
+                    "cache_disk: URL %s failed the size check "
                     "(%" APR_OFF_T_FMT "<%" APR_OFF_T_FMT ")",
                     h->cache_obj->key, dobj->file_size, dconf->minfs);
             /* Remove the intermediate cache file and return non-APR_SUCCESS */
@@ -1238,7 +1238,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,
             apr_int64_t cl = apr_atoi64(cl_header);
             if ((errno == 0) && (dobj->file_size != cl)) {
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                        "disk_cache: URL %s didn't receive complete response, not caching",
+                        "cache_disk: URL %s didn't receive complete response, not caching",
                         h->cache_obj->key);
                 /* Remove the intermediate cache file and return non-APR_SUCCESS */
                 apr_pool_destroy(dobj->data.pool);
@@ -1277,12 +1277,12 @@ static apr_status_t commit_entity(cache_handle_t *h, request_rec *r)
     if (APR_SUCCESS != rv) {
         remove_url(h, r);
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                "disk_cache: commit_entity: URL '%s' not cached due to earlier disk error.",
+                "cache_disk: commit_entity: URL '%s' not cached due to earlier disk error.",
                 dobj->name);
     }
     else {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-                "disk_cache: commit_entity: Headers and body for URL %s cached.",
+                "cache_disk: commit_entity: Headers and body for URL %s cached.",
                 dobj->name);
     }