www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Fix some modules to make them compile with per-module loglevels.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951894 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2010-06-06 16:56:08 +00:00
parent 98a1e93dca
commit 9d791e0e60
6 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/examples/mod_example_hooks.c
View File

@@ -491,7 +491,7 @@ static void trace_nocontext(apr_pool_t *p, const char *file, int line,
*/ */
#ifdef EXAMPLE_LOG_EACH #ifdef EXAMPLE_LOG_EACH
ap_log_perror(file, line, APLOG_NOTICE, 0, p, "%s", note); ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_NOTICE, 0, p, "%s", note);
#endif #endif
} }

2
modules/lua/lua_config.c
View File

@@ -172,7 +172,7 @@ static int cmd_log_at(lua_State *L, int level)
lua_getinfo(L, "Sl", &dbg); lua_getinfo(L, "Sl", &dbg);
msg = luaL_checkstring(L, 2); msg = luaL_checkstring(L, 2);
ap_log_error(dbg.source, dbg.currentline, level, 0, cmd->server, msg); ap_log_error(dbg.source, dbg.currentline, APLOG_MODULE_INDEX, level, 0, cmd->server, msg);
return 0; return 0;
} }

2
modules/lua/lua_request.c
View File

@@ -405,7 +405,7 @@ static int req_log_at(lua_State *L, int level)
lua_getinfo(L, "Sl", &dbg); lua_getinfo(L, "Sl", &dbg);
msg = luaL_checkstring(L, 2); msg = luaL_checkstring(L, 2);
ap_log_rerror(dbg.source, dbg.currentline, level, 0, r, msg); ap_log_rerror(dbg.source, dbg.currentline, APLOG_MODULE_INDEX, level, 0, r, msg);
return 0; return 0;
} }

6
modules/ssl/ssl_engine_log.c
View File

@@ -93,7 +93,7 @@ void ssl_log_ssl_error(const char *file, int line, int level, server_rec *s)
ERR_error_string_n(e, err, sizeof err); ERR_error_string_n(e, err, sizeof err);
annotation = ssl_log_annotation(err); annotation = ssl_log_annotation(err);
ap_log_error(file, line, level, 0, s, ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, s,
"SSL Library Error: %s%s%s%s%s%s", "SSL Library Error: %s%s%s%s%s%s",
/* %s */ /* %s */
err, err,
@@ -117,7 +117,7 @@ void ssl_log_cxerror(const char *file, int line, int level,
char *sname, *iname, *serial; char *sname, *iname, *serial;
BIGNUM *bn; BIGNUM *bn;
if (mySrvFromConn(c)->loglevel < level) { if (APLOG_IS_LEVEL(mySrvFromConn(c),level)) {
/* Bail early since the rest of this function is expensive. */ /* Bail early since the rest of this function is expensive. */
return; return;
} }
@@ -131,7 +131,7 @@ void ssl_log_cxerror(const char *file, int line, int level,
apr_vsnprintf(buf, sizeof buf, format, ap); apr_vsnprintf(buf, sizeof buf, format, ap);
va_end(ap); va_end(ap);
ap_log_cerror(file, line, level, rv, c, ap_log_cerror(file, line, APLOG_MODULE_INDEX, level, rv, c,
"%s [subject: %s, issuer: %s, serial: %s]", "%s [subject: %s, issuer: %s, serial: %s]",
buf, buf,
sname ? sname : "-unknown-", sname ? sname : "-unknown-",

2
modules/ssl/ssl_private.h
View File

@@ -69,6 +69,8 @@
#include <unistd.h> /* needed for STDIN_FILENO et.al., at least on FreeBSD */ #include <unistd.h> /* needed for STDIN_FILENO et.al., at least on FreeBSD */
#endif #endif
APLOG_USE_MODULE(ssl);
/* /*
* Provide reasonable default for some defines * Provide reasonable default for some defines
*/ */

20
modules/ssl/ssl_util.c
View File

@@ -397,18 +397,18 @@ static struct CRYPTO_dynlock_value *ssl_dyn_create_function(const char *file,
*/ */
rv = apr_pool_create(&p, dynlockpool); rv = apr_pool_create(&p, dynlockpool);
if (rv != APR_SUCCESS) { if (rv != APR_SUCCESS) {
ap_log_perror(file, line, APLOG_ERR, rv, dynlockpool, ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, rv, dynlockpool,
"Failed to create subpool for dynamic lock"); "Failed to create subpool for dynamic lock");
return NULL; return NULL;
} }
ap_log_perror(file, line, APLOG_DEBUG, 0, p, ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, 0, p,
"Creating dynamic lock"); "Creating dynamic lock");
value = (struct CRYPTO_dynlock_value *)apr_palloc(p, value = (struct CRYPTO_dynlock_value *)apr_palloc(p,
sizeof(struct CRYPTO_dynlock_value)); sizeof(struct CRYPTO_dynlock_value));
if (!value) { if (!value) {
ap_log_perror(file, line, APLOG_ERR, 0, p, ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, 0, p,
"Failed to allocate dynamic lock structure"); "Failed to allocate dynamic lock structure");
return NULL; return NULL;
} }
@@ -421,7 +421,7 @@ static struct CRYPTO_dynlock_value *ssl_dyn_create_function(const char *file,
rv = apr_thread_mutex_create(&(value->mutex), APR_THREAD_MUTEX_DEFAULT, rv = apr_thread_mutex_create(&(value->mutex), APR_THREAD_MUTEX_DEFAULT,
p); p);
if (rv != APR_SUCCESS) { if (rv != APR_SUCCESS) {
ap_log_perror(file, line, APLOG_ERR, rv, p, ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, rv, p,
"Failed to create thread mutex for dynamic lock"); "Failed to create thread mutex for dynamic lock");
apr_pool_destroy(p); apr_pool_destroy(p);
return NULL; return NULL;
@@ -439,17 +439,17 @@ static void ssl_dyn_lock_function(int mode, struct CRYPTO_dynlock_value *l,
apr_status_t rv; apr_status_t rv;
if (mode & CRYPTO_LOCK) { if (mode & CRYPTO_LOCK) {
ap_log_perror(file, line, APLOG_DEBUG, 0, l->pool, ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, 0, l->pool,
"Acquiring mutex %s:%d", l->file, l->line); "Acquiring mutex %s:%d", l->file, l->line);
rv = apr_thread_mutex_lock(l->mutex); rv = apr_thread_mutex_lock(l->mutex);
ap_log_perror(file, line, APLOG_DEBUG, rv, l->pool, ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, rv, l->pool,
"Mutex %s:%d acquired!", l->file, l->line); "Mutex %s:%d acquired!", l->file, l->line);
} }
else { else {
ap_log_perror(file, line, APLOG_DEBUG, 0, l->pool, ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, 0, l->pool,
"Releasing mutex %s:%d", l->file, l->line); "Releasing mutex %s:%d", l->file, l->line);
rv = apr_thread_mutex_unlock(l->mutex); rv = apr_thread_mutex_unlock(l->mutex);
ap_log_perror(file, line, APLOG_DEBUG, rv, l->pool, ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, rv, l->pool,
"Mutex %s:%d released!", l->file, l->line); "Mutex %s:%d released!", l->file, l->line);
} }
} }
@@ -462,11 +462,11 @@ static void ssl_dyn_destroy_function(struct CRYPTO_dynlock_value *l,
{ {
apr_status_t rv; apr_status_t rv;
ap_log_perror(file, line, APLOG_DEBUG, 0, l->pool, ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, 0, l->pool,
"Destroying dynamic lock %s:%d", l->file, l->line); "Destroying dynamic lock %s:%d", l->file, l->line);
rv = apr_thread_mutex_destroy(l->mutex); rv = apr_thread_mutex_destroy(l->mutex);
if (rv != APR_SUCCESS) { if (rv != APR_SUCCESS) {
ap_log_perror(file, line, APLOG_ERR, rv, l->pool, ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, rv, l->pool,
"Failed to destroy mutex for dynamic lock %s:%d", "Failed to destroy mutex for dynamic lock %s:%d",
l->file, l->line); l->file, l->line);
} }