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 2006/02/14 15:55:04 UTC
svn commit: r377738 - /httpd/httpd/trunk/modules/proxy/proxy_util.c
Author: jim
Date: Tue Feb 14 06:55:02 2006
New Revision: 377738
URL: http://svn.apache.org/viewcvs?rev=377738&view=rev
Log:
I wondered why I never saw the scoreboard init entry; now I know.
The logic flow was slightly askew.
Modified:
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=377738&r1=377737&r2=377738&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Tue Feb 14 06:55:02 2006
@@ -1580,23 +1580,27 @@
void *score = NULL;
#endif
- if (worker->s && worker->s->status & PROXY_WORKER_INITIALIZED) {
+ if (worker->s && (worker->s->status & PROXY_WORKER_INITIALIZED)) {
/* The worker share is already initialized */
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+ "proxy: worker %s already initialized",
+ worker->name);
return;
}
#if PROXY_HAS_SCOREBOARD
/* Get scoreboard slot */
if (ap_scoreboard_image) {
score = ap_get_scoreboard_lb(worker->id);
- if (!score)
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
- "proxy: ap_get_scoreboard_lb(%d) failed for worker %s",
- worker->id, worker->name);
- }
- else {
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
- "proxy: initialized scoreboard slot %d for worker %s",
- worker->id, worker->name);
+ if (!score) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
+ "proxy: ap_get_scoreboard_lb(%d) failed for worker %s",
+ worker->id, worker->name);
+ }
+ else {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+ "proxy: initialized scoreboard slot %d for worker %s",
+ worker->id, worker->name);
+ }
}
#endif
if (!score) {