diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-12-05 00:08:01 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-12-05 00:08:01 +0000 |
| commit | b6ae8ca44adfc5fdf7ec83d8a4fc29ea5d257a55 (patch) | |
| tree | b544d4e790563bccd8b206df63ee562433114242 /modules/core | |
| parent | 2e8b47502c00a1b6ab0f71ae3d9081e18322f6fe (diff) | |
| download | httpd-b6ae8ca44adfc5fdf7ec83d8a4fc29ea5d257a55.tar.gz | |
Backport r1209766, r1210252, r1210284:
Add lots of unique tags to error log messages
ssl_util.c: Downgrade some dynamic locking messages from level DEBUG
to TRACE1-3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210287 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/core')
| -rw-r--r-- | modules/core/mod_so.c | 10 | ||||
| -rw-r--r-- | modules/core/mod_watchdog.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/modules/core/mod_so.c b/modules/core/mod_so.c index 5f44f81593..13ecd9634b 100644 --- a/modules/core/mod_so.c +++ b/modules/core/mod_so.c @@ -184,7 +184,7 @@ static const char *load_module(cmd_parms *cmd, void *dummy, modi = &modie[i]; if (modi->name != NULL && strcmp(modi->name, modname) == 0) { ap_log_perror(APLOG_MARK, APLOG_WARNING, 0, - cmd->pool, "module %s is already loaded, skipping", + cmd->pool, APLOGNO(01574) "module %s is already loaded, skipping", modname); return NULL; } @@ -242,7 +242,7 @@ static const char *load_module(cmd_parms *cmd, void *dummy, apr_dso_error(modhandle, my_error, sizeof(my_error)), NULL); } - ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, cmd->pool, + ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, cmd->pool, APLOGNO(01575) "loaded module %s", modname); /* @@ -324,7 +324,7 @@ static const char *load_file(cmd_parms *cmd, void *dummy, const char *filename) NULL); } - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, APLOGNO(01576) "loaded file %s", filename); return NULL; @@ -391,7 +391,7 @@ static void dump_loaded_modules(apr_pool_t *p, server_rec *s) static const char *load_file(cmd_parms *cmd, void *dummy, const char *filename) { - ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->pool, + ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->pool, APLOGNO(01577) "WARNING: LoadFile not supported on this platform"); return NULL; } @@ -399,7 +399,7 @@ static const char *load_file(cmd_parms *cmd, void *dummy, const char *filename) static const char *load_module(cmd_parms *cmd, void *dummy, const char *modname, const char *filename) { - ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->pool, + ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->pool, APLOGNO(01578) "WARNING: LoadModule not supported on this platform"); return NULL; } diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c index 7fad72efd4..68820e8885 100644 --- a/modules/core/mod_watchdog.c +++ b/modules/core/mod_watchdog.c @@ -451,7 +451,7 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, { const char *ppid = getenv("AP_PARENT_PID"); if (ppid && *ppid) { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01570) "[%" APR_PID_T_FMT " - %s] " "child second stage post config hook", getpid(), ppid); @@ -494,7 +494,7 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, * Create the watchdog thread */ if ((rv = wd_startup(w, wd_server_conf->pool)) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, APLOGNO(01571) "Watchdog: Failed to create parent worker thread."); return rv; } @@ -504,7 +504,7 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, } } if (wd_server_conf->parent_workers) { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01572) "Spawned %d parent worker threads.", wd_server_conf->parent_workers); } @@ -579,7 +579,7 @@ static void wd_child_init_hook(apr_pool_t *p, server_rec *s) * Kick of the watchdog */ if ((rv = wd_startup(w, wd_server_conf->pool)) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, APLOGNO(01573) "Watchdog: Failed to create worker thread."); /* No point to continue */ return; |