Skip to content

Commit 74e3f54

Browse files
author
Stefan Fritsch
committed
Fix some modules to make them compile with per-module loglevels.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951894 13f79535-47bb-0310-9956-ffa450edef68
1 parent fbd058e commit 74e3f54

6 files changed

Lines changed: 18 additions & 16 deletions

File tree

‎modules/examples/mod_example_hooks.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ static void trace_nocontext(apr_pool_t *p, const char *file, int line,
491491
*/
492492

493493
#ifdef EXAMPLE_LOG_EACH
494-
ap_log_perror(file, line, APLOG_NOTICE, 0, p, "%s", note);
494+
ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_NOTICE, 0, p, "%s", note);
495495
#endif
496496
}
497497

‎modules/lua/lua_config.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ static int cmd_log_at(lua_State *L, int level)
172172
lua_getinfo(L, "Sl", &dbg);
173173

174174
msg = luaL_checkstring(L, 2);
175-
ap_log_error(dbg.source, dbg.currentline, level, 0, cmd->server, msg);
175+
ap_log_error(dbg.source, dbg.currentline, APLOG_MODULE_INDEX, level, 0, cmd->server, msg);
176176
return 0;
177177
}
178178

‎modules/lua/lua_request.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ static int req_log_at(lua_State *L, int level)
405405
lua_getinfo(L, "Sl", &dbg);
406406

407407
msg = luaL_checkstring(L, 2);
408-
ap_log_rerror(dbg.source, dbg.currentline, level, 0, r, msg);
408+
ap_log_rerror(dbg.source, dbg.currentline, APLOG_MODULE_INDEX, level, 0, r, msg);
409409
return 0;
410410
}
411411

‎modules/ssl/ssl_engine_log.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void ssl_log_ssl_error(const char *file, int line, int level, server_rec *s)
9393
ERR_error_string_n(e, err, sizeof err);
9494
annotation = ssl_log_annotation(err);
9595

96-
ap_log_error(file, line, level, 0, s,
96+
ap_log_error(file, line, APLOG_MODULE_INDEX, level, 0, s,
9797
"SSL Library Error: %s%s%s%s%s%s",
9898
/* %s */
9999
err,
@@ -117,7 +117,7 @@ void ssl_log_cxerror(const char *file, int line, int level,
117117
char *sname, *iname, *serial;
118118
BIGNUM *bn;
119119

120-
if (mySrvFromConn(c)->loglevel < level) {
120+
if (APLOG_IS_LEVEL(mySrvFromConn(c),level)) {
121121
/* Bail early since the rest of this function is expensive. */
122122
return;
123123
}
@@ -131,7 +131,7 @@ void ssl_log_cxerror(const char *file, int line, int level,
131131
apr_vsnprintf(buf, sizeof buf, format, ap);
132132
va_end(ap);
133133

134-
ap_log_cerror(file, line, level, rv, c,
134+
ap_log_cerror(file, line, APLOG_MODULE_INDEX, level, rv, c,
135135
"%s [subject: %s, issuer: %s, serial: %s]",
136136
buf,
137137
sname ? sname : "-unknown-",

‎modules/ssl/ssl_private.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
#include <unistd.h> /* needed for STDIN_FILENO et.al., at least on FreeBSD */
7070
#endif
7171

72+
APLOG_USE_MODULE(ssl);
73+
7274
/*
7375
* Provide reasonable default for some defines
7476
*/

‎modules/ssl/ssl_util.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -397,18 +397,18 @@ static struct CRYPTO_dynlock_value *ssl_dyn_create_function(const char *file,
397397
*/
398398
rv = apr_pool_create(&p, dynlockpool);
399399
if (rv != APR_SUCCESS) {
400-
ap_log_perror(file, line, APLOG_ERR, rv, dynlockpool,
400+
ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, rv, dynlockpool,
401401
"Failed to create subpool for dynamic lock");
402402
return NULL;
403403
}
404404

405-
ap_log_perror(file, line, APLOG_DEBUG, 0, p,
405+
ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, 0, p,
406406
"Creating dynamic lock");
407407

408408
value = (struct CRYPTO_dynlock_value *)apr_palloc(p,
409409
sizeof(struct CRYPTO_dynlock_value));
410410
if (!value) {
411-
ap_log_perror(file, line, APLOG_ERR, 0, p,
411+
ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, 0, p,
412412
"Failed to allocate dynamic lock structure");
413413
return NULL;
414414
}
@@ -421,7 +421,7 @@ static struct CRYPTO_dynlock_value *ssl_dyn_create_function(const char *file,
421421
rv = apr_thread_mutex_create(&(value->mutex), APR_THREAD_MUTEX_DEFAULT,
422422
p);
423423
if (rv != APR_SUCCESS) {
424-
ap_log_perror(file, line, APLOG_ERR, rv, p,
424+
ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, rv, p,
425425
"Failed to create thread mutex for dynamic lock");
426426
apr_pool_destroy(p);
427427
return NULL;
@@ -439,17 +439,17 @@ static void ssl_dyn_lock_function(int mode, struct CRYPTO_dynlock_value *l,
439439
apr_status_t rv;
440440

441441
if (mode & CRYPTO_LOCK) {
442-
ap_log_perror(file, line, APLOG_DEBUG, 0, l->pool,
442+
ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, 0, l->pool,
443443
"Acquiring mutex %s:%d", l->file, l->line);
444444
rv = apr_thread_mutex_lock(l->mutex);
445-
ap_log_perror(file, line, APLOG_DEBUG, rv, l->pool,
445+
ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, rv, l->pool,
446446
"Mutex %s:%d acquired!", l->file, l->line);
447447
}
448448
else {
449-
ap_log_perror(file, line, APLOG_DEBUG, 0, l->pool,
449+
ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, 0, l->pool,
450450
"Releasing mutex %s:%d", l->file, l->line);
451451
rv = apr_thread_mutex_unlock(l->mutex);
452-
ap_log_perror(file, line, APLOG_DEBUG, rv, l->pool,
452+
ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, rv, l->pool,
453453
"Mutex %s:%d released!", l->file, l->line);
454454
}
455455
}
@@ -462,11 +462,11 @@ static void ssl_dyn_destroy_function(struct CRYPTO_dynlock_value *l,
462462
{
463463
apr_status_t rv;
464464

465-
ap_log_perror(file, line, APLOG_DEBUG, 0, l->pool,
465+
ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_DEBUG, 0, l->pool,
466466
"Destroying dynamic lock %s:%d", l->file, l->line);
467467
rv = apr_thread_mutex_destroy(l->mutex);
468468
if (rv != APR_SUCCESS) {
469-
ap_log_perror(file, line, APLOG_ERR, rv, l->pool,
469+
ap_log_perror(file, line, APLOG_MODULE_INDEX, APLOG_ERR, rv, l->pool,
470470
"Failed to destroy mutex for dynamic lock %s:%d",
471471
l->file, l->line);
472472
}

0 commit comments

Comments
 (0)