Commit 7e295aee authored by Graham Leggett's avatar Graham Leggett
Browse files

mod_proxy: Make ap_proxy_retry_worker() into an optional function. Allows 

mod_lbmethod_bybusyness, mod_lbmethod_byrequests, mod_lbmethod_bytraffic
and mod_lbmethod_heartbeat to be loaded without mod_proxy yet being present,
which happens when modules are loaded in alphabetical order.


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

modules/proxy/balancers/mod_lbmethod_bybusyness.c

+15 −2
Changes for modules/proxy/balancers/mod_lbmethod_bybusyness.c: 15 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 


module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module;



static int (*ap_proxy_retry_worker_fn)(const char *proxy_function,

        proxy_worker *worker, server_rec *s) = NULL;



static proxy_worker *find_best_bybusyness(proxy_balancer *balancer,

                                request_rec *r)

{
@@ -36,6 +39,15 @@ static proxy_worker *find_best_bybusyness(proxy_balancer *balancer, 


    int total_factor = 0;



    if (!ap_proxy_retry_worker_fn) {

        ap_proxy_retry_worker_fn =

                APR_RETRIEVE_OPTIONAL_FN(ap_proxy_retry_worker);

        if (!ap_proxy_retry_worker_fn) {

            /* can only happen if mod_proxy isn't loaded */

            return NULL;

        }

    }



    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,

                 "proxy: Entering bybusyness for BALANCER (%s)",

                 balancer->s->name);
@@ -66,8 +78,9 @@ static proxy_worker *find_best_bybusyness(proxy_balancer *balancer, 
                 * The worker might still be unusable, but we try

                 * anyway.

                 */

                if (!PROXY_WORKER_IS_USABLE(*worker))

                    ap_proxy_retry_worker("BALANCER", *worker, r->server);

                if (!PROXY_WORKER_IS_USABLE(*worker)) {

                    ap_proxy_retry_worker_fn("BALANCER", *worker, r->server);

                }



                /* Take into calculation only the workers that are

                 * not in error state or not disabled.

modules/proxy/balancers/mod_lbmethod_byrequests.c

+13 −1
Changes for modules/proxy/balancers/mod_lbmethod_byrequests.c: 13 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 


module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module;



static int (*ap_proxy_retry_worker_fn)(const char *proxy_function,

        proxy_worker *worker, server_rec *s) = NULL;



/*

 * The idea behind the find_best_byrequests scheduler is the following:

 *
@@ -80,6 +83,15 @@ static proxy_worker *find_best_byrequests(proxy_balancer *balancer, 
    int checking_standby;

    int checked_standby;



    if (!ap_proxy_retry_worker_fn) {

        ap_proxy_retry_worker_fn =

                APR_RETRIEVE_OPTIONAL_FN(ap_proxy_retry_worker);

        if (!ap_proxy_retry_worker_fn) {

            /* can only happen if mod_proxy isn't loaded */

            return NULL;

        }

    }



    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,

                 "proxy: Entering byrequests for BALANCER (%s)",

                 balancer->s->name);
@@ -109,7 +121,7 @@ static proxy_worker *find_best_byrequests(proxy_balancer *balancer, 
                 * anyway.

                 */

                if (!PROXY_WORKER_IS_USABLE(*worker))

                    ap_proxy_retry_worker("BALANCER", *worker, r->server);

                    ap_proxy_retry_worker_fn("BALANCER", *worker, r->server);

                /* Take into calculation only the workers that are

                 * not in error state or not disabled.

                 */

modules/proxy/balancers/mod_lbmethod_bytraffic.c

+13 −1
Changes for modules/proxy/balancers/mod_lbmethod_bytraffic.c: 13 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 


module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module;



static int (*ap_proxy_retry_worker_fn)(const char *proxy_function,

        proxy_worker *worker, server_rec *s) = NULL;



/*

 * The idea behind the find_best_bytraffic scheduler is the following:

 *
@@ -52,6 +55,15 @@ static proxy_worker *find_best_bytraffic(proxy_balancer *balancer, 
    int checking_standby;

    int checked_standby;



    if (!ap_proxy_retry_worker_fn) {

        ap_proxy_retry_worker_fn =

                APR_RETRIEVE_OPTIONAL_FN(ap_proxy_retry_worker);

        if (!ap_proxy_retry_worker_fn) {

            /* can only happen if mod_proxy isn't loaded */

            return NULL;

        }

    }



    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,

                 "proxy: Entering bytraffic for BALANCER (%s)",

                 balancer->s->name);
@@ -81,7 +93,7 @@ static proxy_worker *find_best_bytraffic(proxy_balancer *balancer, 
                 * anyway.

                 */

                if (!PROXY_WORKER_IS_USABLE(*worker))

                    ap_proxy_retry_worker("BALANCER", *worker, r->server);

                    ap_proxy_retry_worker_fn("BALANCER", *worker, r->server);

                /* Take into calculation only the workers that are

                 * not in error state or not disabled.

                 */

modules/proxy/balancers/mod_lbmethod_heartbeat.c

+13 −1
Changes for modules/proxy/balancers/mod_lbmethod_heartbeat.c: 13 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 


module AP_MODULE_DECLARE_DATA lbmethod_heartbeat_module;



static int (*ap_proxy_retry_worker_fn)(const char *proxy_function,

        proxy_worker *worker, server_rec *s) = NULL;



static const ap_slotmem_provider_t *storage = NULL;

static ap_slotmem_instance_t *hm_serversmem = NULL;
@@ -270,6 +273,15 @@ static proxy_worker *find_best_hb(proxy_balancer *balancer, 
        ap_get_module_config(r->server->module_config,

                             &lbmethod_heartbeat_module);



    if (!ap_proxy_retry_worker_fn) {

        ap_proxy_retry_worker_fn =

                APR_RETRIEVE_OPTIONAL_FN(ap_proxy_retry_worker);

        if (!ap_proxy_retry_worker_fn) {

            /* can only happen if mod_proxy isn't loaded */

            return NULL;

        }

    }



    apr_pool_create(&tpool, r->pool);



    servers = apr_hash_make(tpool);
@@ -297,7 +309,7 @@ static proxy_worker *find_best_hb(proxy_balancer *balancer, 
        }



        if (!PROXY_WORKER_IS_USABLE(*worker)) {

            ap_proxy_retry_worker("BALANCER", *worker, r->server);

            ap_proxy_retry_worker_fn("BALANCER", *worker, r->server);

        }



        if (PROXY_WORKER_IS_USABLE(*worker)) {

modules/proxy/mod_proxy.c

+3 −0
Changes for modules/proxy/mod_proxy.c: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "apr_optional.h"

#include "scoreboard.h"

#include "mod_status.h"

#include "proxy_util.h"



#if (MODULE_MAGIC_NUMBER_MAJOR > 20020903)

#include "mod_ssl.h"
@@ -2512,6 +2513,8 @@ static void register_hooks(apr_pool_t *p) 
    /* child init handling */

    ap_hook_child_init(child_init, aszPred, NULL, APR_HOOK_MIDDLE);



    /* register optional functions within proxy_util.c */

    proxy_util_register_hooks(p);

}



AP_DECLARE_MODULE(proxy) =