diff options
| author | Jeff Trawick <trawick@apache.org> | 2013-09-23 20:15:32 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2013-09-23 20:15:32 +0200 |
| commit | 84d106dec4d1b92140b4add04680c5faa6f30d6b (patch) | |
| tree | 4fd12cd20b874ece194330cd4c7f551d9ef9537f /server/log.c | |
| parent | mod_syslog: New module implementing syslog ap_error_log provider. (diff) | |
| download | apache2-84d106dec4d1b92140b4add04680c5faa6f30d6b.tar.xz apache2-84d106dec4d1b92140b4add04680c5faa6f30d6b.zip | |
allow the provider to decide whether or not APLOG_NOTICE
messages should be logged
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1525664 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/log.c')
| -rw-r--r-- | server/log.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/server/log.c b/server/log.c index 0185124169..bd40a591e3 100644 --- a/server/log.c +++ b/server/log.c @@ -1047,27 +1047,18 @@ static void log_error_core(const char *file, int line, int module_index, int configured_level = r ? ap_get_request_module_loglevel(r, module_index) : c ? ap_get_conn_server_module_loglevel(c, s, module_index) : ap_get_server_module_loglevel(s, module_index); - if (s->error_log) { - /* - * If we are doing normal logging, don't log messages that are - * above the module's log level unless it is a startup/shutdown notice - */ - if ((level_and_mask != APLOG_NOTICE) - && (level_and_mask > configured_level)) { - return; - } + /* + * If we are doing normal logging, don't log messages that are + * above the module's log level unless it is a startup/shutdown notice + */ + if ((level_and_mask != APLOG_NOTICE) + && (level_and_mask > configured_level)) { + return; + } + if (s->error_log) { logf = s->error_log; } - else { - /* - * If we are doing logging using provider, don't log messages that are - * above the module's log level (including a startup/shutdown notice) - */ - if (level_and_mask > configured_level) { - return; - } - } /* the faked server_rec from mod_cgid does not have s->module_config */ if (s->module_config) { |