From: Stefan Fritsch Date: Sun, 6 Jun 2010 16:56:08 +0000 (+0000) Subject: Fix some modules to make them compile with per-module loglevels. X-Git-Tag: 2.3.6~46 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d791e0e60049e39237d95dfd3fb195bb7f83b1e;p=apache 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 --- diff --git a/modules/examples/mod_example_hooks.c b/modules/examples/mod_example_hooks.c index 16c94d7394..a9709149e6 100644 --- a/modules/examples/mod_example_hooks.c +++ b/modules/examples/mod_example_hooks.c @@ -491,7 +491,7 @@ static void trace_nocontext(apr_pool_t *p, const char *file, int line, */ #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 } diff --git a/modules/lua/lua_config.c b/modules/lua/lua_config.c index f751432f0c..e9080f4605 100644 --- a/modules/lua/lua_config.c +++ b/modules/lua/lua_config.c @@ -172,7 +172,7 @@ static int cmd_log_at(lua_State *L, int level) lua_getinfo(L, "Sl", &dbg); 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; } diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c index 6c331633c5..c978a665b6 100644 --- a/modules/lua/lua_request.c +++ b/modules/lua/lua_request.c @@ -405,7 +405,7 @@ static int req_log_at(lua_State *L, int level) lua_getinfo(L, "Sl", &dbg); 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; } diff --git a/modules/ssl/ssl_engine_log.c b/modules/ssl/ssl_engine_log.c index c3575bb0b2..24ea839d56 100644 --- a/modules/ssl/ssl_engine_log.c +++ b/modules/ssl/ssl_engine_log.c @@ -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); 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", /* %s */ err, @@ -117,7 +117,7 @@ void ssl_log_cxerror(const char *file, int line, int level, char *sname, *iname, *serial; BIGNUM *bn; - if (mySrvFromConn(c)->loglevel < level) { + if (APLOG_IS_LEVEL(mySrvFromConn(c),level)) { /* Bail early since the rest of this function is expensive. */ return; } @@ -131,7 +131,7 @@ void ssl_log_cxerror(const char *file, int line, int level, apr_vsnprintf(buf, sizeof buf, format, 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]", buf, sname ? sname : "-unknown-", diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index eea6233155..d8f252a01d 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -69,6 +69,8 @@ #include /* needed for STDIN_FILENO et.al., at least on FreeBSD */ #endif +APLOG_USE_MODULE(ssl); + /* * Provide reasonable default for some defines */ diff --git a/modules/ssl/ssl_util.c b/modules/ssl/ssl_util.c index 4ae479994a..2aabb77e86 100644 --- a/modules/ssl/ssl_util.c +++ b/modules/ssl/ssl_util.c @@ -397,18 +397,18 @@ static struct CRYPTO_dynlock_value *ssl_dyn_create_function(const char *file, */ rv = apr_pool_create(&p, dynlockpool); 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"); 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"); value = (struct CRYPTO_dynlock_value *)apr_palloc(p, sizeof(struct CRYPTO_dynlock_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"); 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, p); 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"); apr_pool_destroy(p); return NULL; @@ -439,17 +439,17 @@ static void ssl_dyn_lock_function(int mode, struct CRYPTO_dynlock_value *l, apr_status_t rv; 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); 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); } 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); 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); } } @@ -462,11 +462,11 @@ static void ssl_dyn_destroy_function(struct CRYPTO_dynlock_value *l, { 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); rv = apr_thread_mutex_destroy(l->mutex); 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", l->file, l->line); }