Commit d79060ba authored by Stefan Eissing's avatar Stefan Eissing
Browse files

Merge of r1749695 from trunk: 

mod_http2: fixing APLOG_NO overdose and some log levels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1749698 13f79535-47bb-0310-9956-ffa450edef68
parent 10766c4d

modules/http2/h2_conn_io.c

+6 −6
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static void append_scratch(h2_conn_io *io) 
                                               io->c->bucket_alloc);

        APR_BRIGADE_INSERT_TAIL(io->output, b);

#if LOG_SCRATCH

        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(03386)

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, io->c, APLOGNO(03386)

                      "h2_conn_io(%ld): append_scratch(%ld)", 

                      io->c->id, (long)io->slen);

#endif
@@ -223,7 +223,7 @@ static apr_status_t read_to_scratch(h2_conn_io *io, apr_bucket *b) 
        }

        status = apr_file_read(fd, io->scratch + io->slen, &len);

#if LOG_SCRATCH

        ap_log_cerror(APLOG_MARK, APLOG_INFO, status, io->c, APLOGNO(03387)

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, io->c, APLOGNO(03387)

                      "h2_conn_io(%ld): FILE_to_scratch(%ld)", 

                      io->c->id, (long)len); 

#endif
@@ -236,7 +236,7 @@ static apr_status_t read_to_scratch(h2_conn_io *io, apr_bucket *b) 
        status = apr_bucket_read(b, &data, &len, APR_BLOCK_READ);

        if (status == APR_SUCCESS) {

#if LOG_SCRATCH

            ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(03388)

            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, io->c, APLOGNO(03388)

                          "h2_conn_io(%ld): read_to_scratch(%ld)", 

                          io->c->id, (long)b->length); 

#endif
@@ -333,7 +333,7 @@ apr_status_t h2_conn_io_write(h2_conn_io *io, const char *data, size_t length) 
            remain = assure_scratch_space(io);

            if (remain >= length) {

#if LOG_SCRATCH

                ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(03389)

                ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, io->c, APLOGNO(03389)

                              "h2_conn_io(%ld): write_to_scratch(%ld)", 

                              io->c->id, (long)length); 

#endif
@@ -343,7 +343,7 @@ apr_status_t h2_conn_io_write(h2_conn_io *io, const char *data, size_t length) 
            }

            else {

#if LOG_SCRATCH

                ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(03390)

                ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, io->c, APLOGNO(03390)

                              "h2_conn_io(%ld): write_to_scratch(%ld)", 

                              io->c->id, (long)remain); 

#endif
@@ -385,7 +385,7 @@ apr_status_t h2_conn_io_pass(h2_conn_io *io, apr_bucket_brigade *bb) 
                    APR_BUCKET_REMOVE(b);

                    APR_BRIGADE_INSERT_TAIL(io->output, b);

#if LOG_SCRATCH

                    ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(03391)

                    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, io->c, APLOGNO(03391)

                                  "h2_conn_io(%ld): pass bucket(%ld)", 

                                  io->c->id, (long)b->length);

#endif

modules/http2/h2_mplx.c

+2 −2
Original line number Diff line number Diff line
@@ -486,11 +486,11 @@ static int task_print(void *ctx, void *val) 
                      task->worker_done);

    }

    else if (task) {

        ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(03392) /* NO APLOGNO */

        ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, /* NO APLOGNO */

                      "->03198: h2_stream(%ld-%d): NULL", m->id, task->stream_id);

    }

    else {

        ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(), /* NO APLOGNO */

        ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, /* NO APLOGNO */

                      "->03198: h2_stream(%ld-NULL): NULL", m->id);

    }

    return 1;

modules/http2/h2_ngn_shed.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ h2_ngn_shed *h2_ngn_shed_get_shed(h2_req_engine *ngn) 


void h2_ngn_shed_abort(h2_ngn_shed *shed)

{

    ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c, APLOGNO(03394)

    ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, shed->c, APLOGNO(03394)

                  "h2_ngn_shed(%ld): abort", shed->c->id);

    shed->aborted = 1;

}
@@ -251,7 +251,7 @@ apr_status_t h2_ngn_shed_pull_task(h2_ngn_shed *shed, 
                  "h2_ngn_shed(%ld): pull task for engine %s, shutdown=%d", 

                  shed->c->id, ngn->id, want_shutdown);

    if (shed->aborted) {

        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c, APLOGNO(03397)

        ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, shed->c, APLOGNO(03397)

                      "h2_ngn_shed(%ld): abort while pulling requests %s", 

                      shed->c->id, ngn->id);

        ngn->shutdown = 1;