Commit 258a4135 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

I wondered why I never saw the scoreboard init entry; now I know. 

The logic flow was slightly askew.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@377738 13f79535-47bb-0310-9956-ffa450edef68
parent a3167ade

modules/proxy/proxy_util.c

+6 −2
Changes for modules/proxy/proxy_util.c: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1580,15 +1580,18 @@ PROXY_DECLARE(void) ap_proxy_initialize_worker_share(proxy_server_conf *conf, 
    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)

        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);
@@ -1598,6 +1601,7 @@ PROXY_DECLARE(void) ap_proxy_initialize_worker_share(proxy_server_conf *conf, 
                  "proxy: initialized scoreboard slot %d for worker %s",

                  worker->id, worker->name);

        }

    }

#endif

    if (!score) {

        score = apr_pcalloc(conf->pool, sizeof(proxy_worker_stat));