You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2016/06/22 13:24:17 UTC
svn commit: r1749695 - in /httpd/httpd/trunk/modules/http2: h2_conn_io.c
h2_mplx.c h2_ngn_shed.c
Author: icing
Date: Wed Jun 22 13:24:17 2016
New Revision: 1749695
URL: http://svn.apache.org/viewvc?rev=1749695&view=rev
Log:
mod_http2: fixing APLOG_NO overdose and some log levels
Modified:
httpd/httpd/trunk/modules/http2/h2_conn_io.c
httpd/httpd/trunk/modules/http2/h2_mplx.c
httpd/httpd/trunk/modules/http2/h2_ngn_shed.c
Modified: httpd/httpd/trunk/modules/http2/h2_conn_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_conn_io.c?rev=1749695&r1=1749694&r2=1749695&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_conn_io.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_conn_io.c Wed Jun 22 13:24:17 2016
@@ -171,7 +171,7 @@ static void append_scratch(h2_conn_io *i
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_c
}
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_c
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
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
}
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
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
Modified: httpd/httpd/trunk/modules/http2/h2_mplx.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_mplx.c?rev=1749695&r1=1749694&r2=1749695&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_mplx.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_mplx.c Wed Jun 22 13:24:17 2016
@@ -486,11 +486,11 @@ static int task_print(void *ctx, void *v
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;
Modified: httpd/httpd/trunk/modules/http2/h2_ngn_shed.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_ngn_shed.c?rev=1749695&r1=1749694&r2=1749695&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_ngn_shed.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_ngn_shed.c Wed Jun 22 13:24:17 2016
@@ -139,7 +139,7 @@ h2_ngn_shed *h2_ngn_shed_get_shed(h2_req
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_ng
"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;