VladPolskiy/apache_httpd
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-20 14:14:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add log tags.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1891023 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Graham Leggett
2021-06-24 14:17:02 +00:00
parent 95592b5dda
commit b72da39d62
9 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/log-message-tags/next-number
View File

@ -1 +1 @@
10275
10290

4
modules/aaa/mod_authn_dbm.c
View File

@ -92,7 +92,7 @@ static apr_status_t fetch_dbm_value(request_rec *r, const char *dbmtype,
rv = apr_dbm_get_driver(&driver, dbmtype, &err, r->pool);
if (rv != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO()
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(10284)
"could not load '%s' dbm library: %s",
err->reason, err->msg);
return rv;
@ -106,7 +106,7 @@ static apr_status_t fetch_dbm_value(request_rec *r, const char *dbmtype,
#endif
if (rv != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO()
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(10285)
"could not open dbm (type %s) file: %s",
dbmtype, dbmfile);
return rv;

2
modules/aaa/mod_authz_dbm.c
View File

@ -113,7 +113,7 @@ static apr_status_t get_dbm_grp(request_rec *r, char *key1, char *key2,
retval = apr_dbm_get_driver(&driver, dbtype, &err, r->pool);
if (retval != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, retval, r, APLOGNO()
ap_log_rerror(APLOG_MARK, APLOG_ERR, retval, r, APLOGNO(10286)
"could not load '%s' dbm library: %s",
err->reason, err->msg);
return retval;

6
modules/cache/mod_cache_socache.c vendored
View File

@ -18,6 +18,12 @@
#include "apr_file_io.h"
#include "apr_strings.h"
#include "apr_buckets.h"
#include "apr_version.h"
#if !APR_VERSION_AT_LEAST(2,0,0)
#include "apu_version.h"
#endif
#include "httpd.h"
#include "http_config.h"
#include "http_log.h"

14
modules/cache/mod_socache_dbm.c vendored
View File

@ -149,7 +149,7 @@ static apr_status_t socache_dbm_init(ap_socache_instance_t *ctx,
#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
if ((rv = apr_dbm_get_driver(&driver, NULL, &err,
ctx->pool) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO()
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10277)
"Cannot load socache DBM library '%s': %s",
err->reason, err->msg);
return rv;
@ -256,7 +256,7 @@ static apr_status_t socache_dbm_store(ap_socache_instance_t *ctx,
#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
if ((rv = apr_dbm_get_driver(&driver, NULL, &err,
ctx->pool) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO()
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10278)
"Cannot load socache DBM library '%s' (store): %s",
err->reason, err->msg);
free(dbmval.dptr);
@ -333,7 +333,7 @@ static apr_status_t socache_dbm_retrieve(ap_socache_instance_t *ctx, server_rec
#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
if ((rv = apr_dbm_get_driver(&driver, NULL, &err,
ctx->pool) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO()
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10279)
"Cannot load socache DBM library '%s' (fetch): %s",
err->reason, err->msg);
return rc;
@ -411,7 +411,7 @@ static apr_status_t socache_dbm_remove(ap_socache_instance_t *ctx,
#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
if ((rv = apr_dbm_get_driver(&driver, NULL, &err,
ctx->pool) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO()
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10280)
"Cannot load socache DBM library '%s' (delete): %s",
err->reason, err->msg);
return rv;
@ -474,7 +474,7 @@ static void socache_dbm_expire(ap_socache_instance_t *ctx, server_rec *s)
#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
if ((rv = apr_dbm_get_driver(&driver, NULL, &err,
ctx->pool) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO()
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10281)
"Cannot load socache DBM library '%s' (expire): %s",
err->reason, err->msg);
return rv;
@ -605,7 +605,7 @@ static void socache_dbm_status(ap_socache_instance_t *ctx, request_rec *r,
#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
if ((rv = apr_dbm_get_driver(&driver, NULL, &err,
ctx->pool) != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO()
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(10282)
"Cannot load socache DBM library '%s' (status retrieval): %s",
err->reason, err->msg);
return;
@ -682,7 +682,7 @@ static apr_status_t socache_dbm_iterate(ap_socache_instance_t *ctx,
#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
if ((rv = apr_dbm_get_driver(&driver, NULL, &err,
ctx->pool) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO()
ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10283)
"Cannot load socache DBM library '%s' (iterating): %s",
err->reason, err->msg);
return rv;

2
modules/dav/fs/dbm.c
View File

@ -143,7 +143,7 @@ dav_error * dav_dbm_open_direct(apr_pool_t *p, const char *pathname, int ro,
#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
if ((status = apr_dbm_get_driver(&driver, NULL, &err, p)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, APLOGNO()
ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, APLOGNO(10289)
"mod_dav_fs: The DBM library '%s' could not be loaded: %s",
err->reason, err->msg);
return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 1, status,

2
modules/dav/lock/locks.c
View File

@ -332,7 +332,7 @@ static dav_error * dav_generic_really_open_lockdb(dav_lockdb *lockdb)
status = apr_dbm_get_driver(&driver, NULL, &er, lockdb->info->pool);
if (status) {
ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, APLOGNO()
ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, APLOGNO(10288)
"mod_dav_lock: The DBM library '%s' could not be loaded: %s",
er->reason, er->msg);
return dav_new_error(lockdb->info->pool, HTTP_INTERNAL_SERVER_ERROR, 1,

2
modules/mappers/mod_rewrite.c
View File

@ -1399,7 +1399,7 @@ static char *lookup_map_dbmfile(request_rec *r, const char *file,
#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 7)
if ((rv = apr_dbm_get_driver(&driver, dbmtype, &err,
r->pool)) != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO()
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(10287)
"mod_rewrite: can't load DBM library '%s': %s",
err->reason, err->msg);
return NULL;

4
modules/proxy/mod_proxy_express.c
View File

@ -146,7 +146,7 @@ static int xlate_name(request_rec *r)
rv = apr_dbm_get_driver(&driver, sconf->dbmtype, &err, r->pool);
if (rv != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
APLOGNO() "The dbm library '%s' could not be loaded: %s (%s: %d)",
APLOGNO(10275) "The dbm library '%s' could not be loaded: %s (%s: %d)",
sconf->dbmtype, err->msg, err->reason, err->rc);
return DECLINED;
}
@ -155,7 +155,7 @@ static int xlate_name(request_rec *r)
APR_OS_DEFAULT, r->pool);
if (rv != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
APLOGNO() "The '%s' file '%s' could not be loaded",
APLOGNO(10276) "The '%s' file '%s' could not be loaded",
sconf->dbmtype, sconf->dbmfile);
return DECLINED;
}