Commit 459a9b25 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Add some more log message tags 

Remove some log message tags from ap_log_* calls that log lots of
different error messages, in particular the config parsing errors.
Not sure how we should handle those.

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/trunk@1210252 13f79535-47bb-0310-9956-ffa450edef68
parent 7e35f258

docs/log-message-tags/next-number

+1 −1
Changes for docs/log-message-tags/next-number: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
2183
 
2231

modules/filters/mod_charset_lite.c

+7 −8
Changes for modules/filters/mod_charset_lite.c: 7 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -479,19 +479,19 @@ static void log_xlate_error(ap_filter_t *f, apr_status_t rv) 
    switch(ctx->ees) {

    case EES_LIMIT:

        rv = 0;

        msg = "xlate filter - a built-in restriction was encountered";

        msg = APLOGNO(02193) "xlate filter - a built-in restriction was encountered";

        break;

    case EES_BAD_INPUT:

        rv = 0;

        msg = "xlate filter - an input character was invalid";

        msg = APLOGNO(02194) "xlate filter - an input character was invalid";

        break;

    case EES_BUCKET_READ:

        rv = 0;

        msg = "xlate filter - bucket read routine failed";

        msg = APLOGNO(02195) "xlate filter - bucket read routine failed";

        break;

    case EES_INCOMPLETE_CHAR:

        rv = 0;

        strcpy(msgbuf, "xlate filter - incomplete char at end of input - ");

        strcpy(msgbuf, APLOGNO(02196) "xlate filter - incomplete char at end of input - ");

        cur = 0;

        while ((apr_size_t)cur < ctx->saved) {

            apr_snprintf(msgbuf + strlen(msgbuf), sizeof(msgbuf) - strlen(msgbuf),
@@ -501,13 +501,12 @@ static void log_xlate_error(ap_filter_t *f, apr_status_t rv) 
        msg = msgbuf;

        break;

    case EES_DOWNSTREAM:

        msg = "xlate filter - an error occurred in a lower filter";

        msg = APLOGNO(02197) "xlate filter - an error occurred in a lower filter";

        break;

    default:

        msg = "xlate filter - returning error";

        msg = APLOGNO(02198) "xlate filter - returning error";

    }

    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, APLOGNO(01450)

                  "%s", msg);

    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, "%s", msg);

}



/* chk_filter_chain() is called once per filter instance; it tries to

modules/filters/mod_sed.c

+1 −1
Changes for modules/filters/mod_sed.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ module AP_MODULE_DECLARE_DATA sed_module; 
static apr_status_t log_sed_errf(void *data, const char *error)

{

    request_rec *r = (request_rec *) data;

    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01381) "%s", error);

    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", error);

    return APR_SUCCESS;

}

modules/loggers/mod_log_debug.c

+2 −2
Changes for modules/loggers/mod_log_debug.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -79,11 +79,11 @@ static void do_debug_log(request_rec *r, const char *hookname) 
            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00641)

                          "Can't evaluate message expression: %s", err);

        if (APLOGrdebug(r))

            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00642) "%s (%s hook, %s:%d)",

            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "%s (%s hook, %s:%d)",

                           msg, hookname, entry->msg_expr->filename,

                           entry->msg_expr->line_number);

        else

            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00643) "%s", msg);

            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "%s", msg);

    }

}

modules/proxy/mod_proxy_balancer.c

+2 −2
Changes for modules/proxy/mod_proxy_balancer.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -707,8 +707,8 @@ static int balancer_post_config(apr_pool_t *pconf, apr_pool_t *plog, 
        ap_proxy_retry_worker_fn =

                APR_RETRIEVE_OPTIONAL_FN(ap_proxy_retry_worker);

        if (!ap_proxy_retry_worker_fn) {

            ap_log_error(

                    APLOG_MARK, APLOG_EMERG, 0, s, "mod_proxy must be loaded for mod_proxy_balancer");

            ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(02230)

                         "mod_proxy must be loaded for mod_proxy_balancer");

            return !OK;

        }

    }