From: Jean-Frederic Clere <jfclere@apache.org>
Date: Thu, 3 Aug 2006 16:01:50 +0000 (+0000)
Subject: Use only one slotmem for status and checker.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26d5e1681b9d234c1a5cd92fca81eb1e90461edb;p=thirdparty%2Fapache%2Fhttpd.git

Use only one slotmem for status and checker.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428437 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_health_checker.c b/modules/proxy/mod_proxy_health_checker.c
index c7a60099689..44afc8c64fd 100644
--- a/modules/proxy/mod_proxy_health_checker.c
+++ b/modules/proxy/mod_proxy_health_checker.c
@@ -40,13 +40,19 @@ static int healthck_post_config(apr_pool_t *pconf, apr_pool_t *plog,
 {
     const health_worker_method *worker_storage;
     worker_storage = ap_lookup_provider(PROXY_CKMETHOD, "default", "0");
+    proxy_server_conf *sconf = ap_get_module_config(s->module_config,
+                                                    &proxy_module);
+    char *slotmem_loc = sconf->slotmem_loc;
     
     if (worker_storage) {
         apr_status_t rv;
-        rv = worker_storage->create_slotmem("proxy/checker", ap_proxy_lb_workers(), pconf);
+        if (!slotmem_loc)
+            slotmem_loc = apr_pstrcat(pconf, ":", proxy_module.name, NULL);
+
+        rv = worker_storage->create_slotmem(slotmem_loc, ap_proxy_lb_workers(), pconf);
         if (rv != APR_SUCCESS) {
             ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
-                        "proxy: BALANCER: The health checker can't create slotmem");
+                        "proxy: HEALTHCHECK: The health checker can't create slotmem");
             return APR_EGENERAL;
         }