You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/10/11 19:36:25 UTC
svn commit: r1531370 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.c
mod_proxy_balancer.c proxy_util.c
Author: jim
Date: Fri Oct 11 17:36:24 2013
New Revision: 1531370
URL: http://svn.apache.org/r1531370
Log:
syntax sugar... if the worker is associated w/ a UDS,
then make sure the log reporting has a visual clue.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.c
httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1531370&r1=1531369&r2=1531370&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Fri Oct 11 17:36:24 2013
@@ -1544,15 +1544,15 @@ static const char *
} else {
reuse = 1;
ap_log_error(APLOG_MARK, APLOG_INFO, 0, cmd->server, APLOGNO(01145)
- "Sharing worker '%s' instead of creating new worker '%s'",
- worker->s->name, new->real);
+ "Sharing worker '%s%s' instead of creating new worker '%s'",
+ worker->s->name, (worker->s->uds?"|":""), new->real);
}
for (i = 0; i < arr->nelts; i++) {
if (reuse) {
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server, APLOGNO(01146)
- "Ignoring parameter '%s=%s' for worker '%s' because of worker sharing",
- elts[i].key, elts[i].val, worker->s->name);
+ "Ignoring parameter '%s=%s' for worker '%s%s' because of worker sharing",
+ elts[i].key, elts[i].val, worker->s->name, (worker->s->uds?"|":""));
} else {
const char *err = set_worker_param(cmd->pool, worker, elts[i].key,
elts[i].val);
@@ -2023,8 +2023,8 @@ static const char *add_member(cmd_parms
} else {
reuse = 1;
ap_log_error(APLOG_MARK, APLOG_INFO, 0, cmd->server, APLOGNO(01149)
- "Sharing worker '%s' instead of creating new worker '%s'",
- worker->s->name, name);
+ "Sharing worker '%s%s' instead of creating new worker '%s'",
+ worker->s->name, (worker->s->uds?"|":""), name);
}
arr = apr_table_elts(params);
@@ -2032,8 +2032,8 @@ static const char *add_member(cmd_parms
for (i = 0; i < arr->nelts; i++) {
if (reuse) {
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server, APLOGNO(01150)
- "Ignoring parameter '%s=%s' for worker '%s' because of worker sharing",
- elts[i].key, elts[i].val, worker->s->name);
+ "Ignoring parameter '%s=%s' for worker '%s%s' because of worker sharing",
+ elts[i].key, elts[i].val, worker->s->name, (worker->s->uds?"|":""));
} else {
err = set_worker_param(cmd->pool, worker, elts[i].key,
elts[i].val);
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=1531370&r1=1531369&r2=1531370&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Fri Oct 11 17:36:24 2013
@@ -118,7 +118,8 @@ static void init_balancer_members(apr_po
int worker_is_initialized;
proxy_worker *worker = *workers;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01158)
- "Looking at %s -> %s initialized?", balancer->s->name, worker->s->name);
+ "Looking at %s -> %s%s initialized?", balancer->s->name, worker->s->name,
+ (worker->s->uds?"|":""));
worker_is_initialized = PROXY_WORKER_IS_INITIALIZED(worker);
if (!worker_is_initialized) {
ap_proxy_initialize_worker(worker, s, p);
@@ -638,10 +639,11 @@ static int proxy_balancer_post_request(p
int val = ((int *)balancer->errstatuses->elts)[i];
if (r->status == val) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01174)
- "%s: Forcing worker (%s) into error state "
+ "%s: Forcing worker (%s%s) into error state "
"due to status code %d matching 'failonstatus' "
"balancer parameter",
- balancer->s->name, worker->s->name, val);
+ balancer->s->name, worker->s->name,
+ (worker->s->uds?"|":""), val);
worker->s->status |= PROXY_WORKER_IN_ERROR;
worker->s->error_time = apr_time_now();
break;
@@ -652,9 +654,9 @@ static int proxy_balancer_post_request(p
if (balancer->failontimeout
&& (apr_table_get(r->notes, "proxy_timedout")) != NULL) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02460)
- "%s: Forcing worker (%s) into error state "
+ "%s: Forcing worker (%s%s) into error state "
"due to timeout and 'failonstatus' parameter being set",
- balancer->s->name, worker->s->name);
+ balancer->s->name, worker->s->name, (worker->s->uds?"|":""));
worker->s->status |= PROXY_WORKER_IN_ERROR;
worker->s->error_time = apr_time_now();
@@ -1282,7 +1284,7 @@ static int balancer_handler(request_rec
worker = *workers;
/* Start proxy_worker */
ap_rputs(" <httpd:worker>\n", r);
- ap_rvputs(r, " <httpd:name>", worker->s->name,
+ ap_rvputs(r, " <httpd:name>", worker->s->name, (worker->s->uds?"|":""),
"</httpd:name>\n", NULL);
ap_rvputs(r, " <httpd:scheme>", worker->s->scheme,
"</httpd:scheme>\n", NULL);
@@ -1531,7 +1533,8 @@ static int balancer_handler(request_rec
ap_escape_uri(r->pool, worker->s->name),
"&nonce=", balancer->s->nonce,
"\">", NULL);
- ap_rvputs(r, worker->s->name, (worker->s->uds ? "|" : ""), "</a></td>", NULL);
+ ap_rvputs(r, (worker->s->uds ? "<i>" : ""), worker->s->name,
+ (worker->s->uds ? "|</i>" : ""), "</a></td>", NULL);
ap_rvputs(r, "<td>", ap_escape_html(r->pool, worker->s->route),
NULL);
ap_rvputs(r, "</td><td>",
@@ -1556,7 +1559,7 @@ static int balancer_handler(request_rec
ap_rputs("<hr />\n", r);
if (wsel && bsel) {
ap_rputs("<h3>Edit worker settings for ", r);
- ap_rvputs(r, wsel->s->name, "</h3>\n", NULL);
+ ap_rvputs(r, (wsel->s->uds?"<i>":""), wsel->s->name, (wsel->s->uds?"|</i>":""), "</h3>\n", NULL);
ap_rputs("<form method=\"POST\" enctype=\"application/x-www-form-urlencoded\" action=\"", r);
ap_rvputs(r, ap_escape_uri(r->pool, action), "\">\n", NULL);
ap_rputs("<dl>\n<table><tr><td>Load factor:</td><td><input name='w_lf' id='w_lf' type=text ", r);
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1531370&r1=1531369&r2=1531370&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Fri Oct 11 17:36:24 2013
@@ -1361,9 +1361,9 @@ static apr_status_t connection_cleanup(v
/* Sanity check: Did we already return the pooled connection? */
if (conn->inreslist) {
ap_log_perror(APLOG_MARK, APLOG_ERR, 0, conn->pool, APLOGNO(00923)
- "Pooled connection 0x%pp for worker %s has been"
+ "Pooled connection 0x%pp for worker %s%s has been"
" already returned to the connection pool.", conn,
- worker->s->name);
+ worker->s->name, (worker->s->uds?"|":""));
return APR_SUCCESS;
}
@@ -1700,8 +1700,8 @@ PROXY_DECLARE(apr_status_t) ap_proxy_sha
action = "re-using";
}
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02338)
- "%s shm[%d] (0x%pp) for worker: %s", action, i, (void *)shm,
- worker->s->name);
+ "%s shm[%d] (0x%pp) for worker: %s%s", action, i, (void *)shm,
+ worker->s->name, (worker->s->uds?"|":""));
worker->s = shm;
worker->s->index = i;
@@ -1716,11 +1716,13 @@ PROXY_DECLARE(apr_status_t) ap_proxy_ini
if (worker->s->status & PROXY_WORKER_INITIALIZED) {
/* The worker is already initialized */
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00924)
- "worker %s shared already initialized", worker->s->name);
+ "worker %s%s shared already initialized", worker->s->name,
+ (worker->s->uds?"|":""));
}
else {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00925)
- "initializing worker %s shared", worker->s->name);
+ "initializing worker %s%s shared", worker->s->name,
+ (worker->s->uds?"|":""));
/* Set default parameters */
if (!worker->s->retry_set) {
worker->s->retry = apr_time_from_sec(PROXY_WORKER_DEFAULT_RETRY);
@@ -1756,11 +1758,13 @@ PROXY_DECLARE(apr_status_t) ap_proxy_ini
/* What if local is init'ed and shm isn't?? Even possible? */
if (worker->local_status & PROXY_WORKER_INITIALIZED) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00926)
- "worker %s local already initialized", worker->s->name);
+ "worker %s%s local already initialized", worker->s->name,
+ (worker->s->uds?"|":""));
}
else {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00927)
- "initializing worker %s local", worker->s->name);
+ "initializing worker %s%s local", worker->s->name,
+ (worker->s->uds?"|":""));
apr_global_mutex_lock(proxy_mutex);
/* Now init local worker data */
if (worker->tmutex == NULL) {
@@ -2916,8 +2920,8 @@ PROXY_DECLARE(apr_status_t) ap_proxy_syn
if (worker->hash.def == shm->hash.def && worker->hash.fnv == shm->hash.fnv) {
found = 1;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02402)
- "re-grabbing shm[%d] (0x%pp) for worker: %s", i, (void *)shm,
- worker->s->name);
+ "re-grabbing shm[%d] (0x%pp) for worker: %s%s", i, (void *)shm,
+ worker->s->name, (worker->s->uds?"|":""));
break;
}
}