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/03/21 10:17:36 UTC
svn commit: r1735931 - in /httpd/httpd/trunk/modules/http2:
h2_proxy_session.c mod_proxy_http2.c
Author: icing
Date: Mon Mar 21 09:17:36 2016
New Revision: 1735931
URL: http://svn.apache.org/viewvc?rev=1735931&view=rev
Log:
APLOGNO update for mod_proxy_http2
Modified:
httpd/httpd/trunk/modules/http2/h2_proxy_session.c
httpd/httpd/trunk/modules/http2/mod_proxy_http2.c
Modified: httpd/httpd/trunk/modules/http2/h2_proxy_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_proxy_session.c?rev=1735931&r1=1735930&r2=1735931&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_proxy_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_proxy_session.c Mon Mar 21 09:17:36 2016
@@ -93,7 +93,7 @@ static int proxy_pass_brigade(apr_bucket
* issues in case of error returned below. */
apr_brigade_cleanup(bb);
if (status != APR_SUCCESS) {
- ap_log_cerror(APLOG_MARK, APLOG_ERR, status, origin, APLOGNO()
+ ap_log_cerror(APLOG_MARK, APLOG_ERR, status, origin, APLOGNO(03357)
"pass output failed to %pI (%s)",
p_conn->addr, p_conn->hostname);
}
@@ -338,7 +338,7 @@ static int on_data_chunk_recv(nghttp2_se
stream = nghttp2_session_get_stream_user_data(ngh2, stream_id);
if (!stream) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, stream->r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, stream->r, APLOGNO(03358)
"h2_proxy_session(%s): recv data chunk for "
"unknown stream %d, ignored",
session->id, stream_id);
@@ -360,7 +360,7 @@ static int on_data_chunk_recv(nghttp2_se
APR_BRIGADE_INSERT_TAIL(stream->output, b);
}
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, stream->r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, stream->r, APLOGNO(03359)
"h2_proxy_session(%s): pass response data for "
"stream %d, %d bytes", session->id, stream_id, (int)len);
status = ap_pass_brigade(stream->r->output_filters, stream->output);
@@ -380,7 +380,7 @@ static int on_stream_close(nghttp2_sessi
{
h2_proxy_session *session = user_data;
if (!session->aborted) {
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO()
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03360)
"h2_proxy_session(%s): stream=%d, closed, err=%d",
session->id, stream_id, error_code);
dispatch_event(session, H2_PROXYS_EV_STREAM_DONE, stream_id, NULL);
@@ -424,7 +424,7 @@ static ssize_t stream_data_read(nghttp2_
*data_flags = 0;
stream = nghttp2_session_get_stream_user_data(ngh2, stream_id);
if (!stream) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, stream->r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, stream->r, APLOGNO(03361)
"h2_proxy_stream(%s): data_read, stream %d not found",
stream->session->id, stream_id);
return NGHTTP2_ERR_CALLBACK_FAILURE;
@@ -541,7 +541,7 @@ h2_proxy_session *h2_proxy_session_setup
nghttp2_option_del(option);
nghttp2_session_callbacks_del(cbs);
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03362)
"setup session for %s", p_conn->hostname);
}
return p_conn->data;
@@ -643,7 +643,7 @@ static apr_status_t submit_stream(h2_pro
if (APLOGcdebug(session->c)) {
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c,
- "h2_proxy_session(%s): submit %s%s -> %d",
+ "h2_proxy_session(%s): submit %s%s -> %d", APLOGNO(03363)
session->id, stream->req->authority, stream->req->path,
rv);
}
@@ -723,7 +723,7 @@ static apr_status_t h2_proxy_session_rea
}
else {
/* cannot block on timeout */
- ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, session->c,
+ ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, session->c, APLOGNO()
"h2_proxy_session(%s): unable to get conn socket",
session->id);
return APR_ENOTIMPL;
@@ -748,7 +748,7 @@ static apr_status_t h2_proxy_session_rea
/* nop */
}
else if (!APR_STATUS_IS_EAGAIN(status)) {
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c, APLOGNO()
"h2_proxy_session(%s): read error", session->id);
dispatch_event(session, H2_PROXYS_EV_CONN_ERROR, status, NULL);
}
@@ -764,7 +764,7 @@ apr_status_t h2_proxy_session_submit(h2_
status = open_stream(session, url, r, &stream);
if (status == OK) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO()
"process stream(%d): %s %s%s, original: %s",
stream->id, stream->req->method,
stream->req->authority, stream->req->path,
@@ -800,7 +800,7 @@ static apr_status_t check_suspended(h2_p
}
else if (status != APR_SUCCESS && !APR_STATUS_IS_EAGAIN(status)) {
ap_log_cerror(APLOG_MARK, APLOG_WARNING, status, session->c,
- "h2_proxy_stream(%s-%d): check input",
+ APLOGNO() "h2_proxy_stream(%s-%d): check input",
session->id, stream_id);
h2_iq_remove(session->suspended, stream_id);
dispatch_event(session, H2_PROXYS_EV_STREAM_RESUMED, 0, NULL);
@@ -1033,7 +1033,7 @@ static void ev_stream_done(h2_proxy_sess
stream = nghttp2_session_get_stream_user_data(session->ngh2, stream_id);
if (stream) {
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03364)
"h2_proxy_sesssion(%s): stream(%d) closed",
session->id, stream_id);
@@ -1230,6 +1230,7 @@ run_loop:
status = h2_proxy_session_read(session, 1, session->wait_timeout);
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c,
+ APLOGNO(03365)
"h2_proxy_session(%s): WAIT read, timeout=%fms",
session->id, (float)session->wait_timeout/1000.0);
if (status == APR_SUCCESS) {
@@ -1293,7 +1294,7 @@ void h2_proxy_session_cleanup(h2_proxy_s
cleanup_iter_ctx ctx;
ctx.session = session;
ctx.done = done;
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03366)
"h2_proxy_session(%s): terminated, %d streams unfinished",
session->id, (int)h2_ihash_count(session->streams));
h2_ihash_iter(session->streams, done_iter, &ctx);
Modified: httpd/httpd/trunk/modules/http2/mod_proxy_http2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/mod_proxy_http2.c?rev=1735931&r1=1735930&r2=1735931&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/mod_proxy_http2.c (original)
+++ httpd/httpd/trunk/modules/http2/mod_proxy_http2.c Mon Mar 21 09:17:36 2016
@@ -245,7 +245,7 @@ static apr_status_t proxy_engine_init(h2
*pctx = ctx;
return APR_SUCCESS;
}
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(03368)
"h2_proxy_session, engine init, no ctx found");
return APR_ENOTIMPL;
}
@@ -282,6 +282,7 @@ static void request_done(h2_proxy_sessio
if (req_engine_push(ctx->engine_type, r, NULL) == APR_SUCCESS) {
/* push to engine */
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, r->connection,
+ APLOGNO(03369)
"h2_proxy_session(%s): rescheduled request %s",
ctx->engine_id, task_id);
return;
@@ -296,6 +297,7 @@ static void request_done(h2_proxy_sessio
if (complete) {
if (req_engine_done && ctx->engine) {
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, r->connection,
+ APLOGNO(03370)
"h2_proxy_session(%s): finished request %s",
ctx->engine_id, task_id);
req_engine_done(ctx->engine, r->connection);
@@ -304,6 +306,7 @@ static void request_done(h2_proxy_sessio
else {
if (req_engine_done && ctx->engine) {
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, r->connection,
+ APLOGNO(03371)
"h2_proxy_session(%s): failed request %s",
ctx->engine_id, task_id);
req_engine_done(ctx->engine, r->connection);
@@ -343,11 +346,11 @@ static apr_status_t proxy_engine_run(h2_
request_done);
if (!ctx->session) {
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->owner,
- "session unavailable");
+ APLOGNO(03372) "session unavailable");
return HTTP_SERVICE_UNAVAILABLE;
}
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->owner,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->owner, APLOGNO(03373)
"eng(%s): run session %s", ctx->engine_id, ctx->session->id);
ctx->session->user_data = ctx;
@@ -370,7 +373,8 @@ static apr_status_t proxy_engine_run(h2_
if (s2 == APR_ECONNABORTED) {
/* master connection gone */
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, s2, ctx->owner,
- "eng(%s): pull request", ctx->engine_id);
+ APLOGNO(03374) "eng(%s): pull request",
+ ctx->engine_id);
status = s2;
break;
}
@@ -381,7 +385,8 @@ static apr_status_t proxy_engine_run(h2_
else {
/* end of processing, maybe error */
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, ctx->owner,
- "eng(%s): end of session run", ctx->engine_id);
+ APLOGNO(03375) "eng(%s): end of session run",
+ ctx->engine_id);
/*
* Any open stream of that session needs to
* a) be reopened on the new session iff safe to do so
@@ -587,7 +592,7 @@ run_session:
/* session and connection still ok */
if (next_request(ctx, 1) == APR_SUCCESS) {
/* more requests, run again */
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->owner,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, ctx->owner, APLOGNO(03376)
"run_session, again");
goto run_session;
}
@@ -619,7 +624,8 @@ cleanup:
}
ap_set_module_config(ctx->owner->conn_config, &proxy_http2_module, NULL);
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, ctx->owner, "leaving handler");
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, ctx->owner,
+ APLOGNO(03377) "leaving handler");
return ctx->r_status;
}