VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-06 11:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

final tune and preventative coding

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1786009 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2017-03-08 16:31:05 +00:00
parent 60301274df
commit cf85d9f6e6
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/proxy/mod_proxy_hcheck.c
View File

@ -78,19 +78,17 @@ typedef struct {
static void *hc_create_config(apr_pool_t *p, server_rec *s) static void *hc_create_config(apr_pool_t *p, server_rec *s)
{ {
sctx_t *ctx = (sctx_t *) apr_palloc(p, sizeof(sctx_t)); sctx_t *ctx = apr_pcalloc(p, sizeof(sctx_t));
ctx->s = s;
apr_pool_create(&ctx->p, p); apr_pool_create(&ctx->p, p);
ctx->ba = apr_bucket_alloc_create(p); ctx->ba = apr_bucket_alloc_create(p);
ctx->templates = apr_array_make(p, 10, sizeof(hc_template_t)); ctx->templates = apr_array_make(p, 10, sizeof(hc_template_t));
ctx->conditions = apr_table_make(p, 10); ctx->conditions = apr_table_make(p, 10);
ctx->hcworkers = apr_hash_make(p); ctx->hcworkers = apr_hash_make(p);
ctx->s = s;
return ctx; return ctx;
} }
static ap_watchdog_t *watchdog; static ap_watchdog_t *watchdog;
static apr_thread_pool_t *hctp = NULL;
static int tpsize = HC_THREADPOOL_SIZE; static int tpsize = HC_THREADPOOL_SIZE;
/* /*
@ -872,6 +870,8 @@ static apr_status_t hc_watchdog_callback(int state, void *data,
sctx_t *ctx = (sctx_t *)data; sctx_t *ctx = (sctx_t *)data;
server_rec *s = ctx->s; server_rec *s = ctx->s;
proxy_server_conf *conf; proxy_server_conf *conf;
static apr_thread_pool_t *hctp = NULL;
switch (state) { switch (state) {
case AP_WATCHDOG_STATE_STARTING: case AP_WATCHDOG_STATE_STARTING:
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(03258) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(03258)
@ -978,9 +978,10 @@ static apr_status_t hc_watchdog_callback(int state, void *data,
} }
static int hc_post_config(apr_pool_t *p, apr_pool_t *plog, static int hc_post_config(apr_pool_t *p, apr_pool_t *plog,
apr_pool_t *ptemp, server_rec *s) apr_pool_t *ptemp, server_rec *main_s)
{ {
apr_status_t rv; apr_status_t rv;
server_rec *s = main_s;
APR_OPTIONAL_FN_TYPE(ap_watchdog_get_instance) *hc_watchdog_get_instance; APR_OPTIONAL_FN_TYPE(ap_watchdog_get_instance) *hc_watchdog_get_instance;
APR_OPTIONAL_FN_TYPE(ap_watchdog_register_callback) *hc_watchdog_register_callback; APR_OPTIONAL_FN_TYPE(ap_watchdog_register_callback) *hc_watchdog_register_callback;
@ -1009,9 +1010,9 @@ static int hc_post_config(apr_pool_t *p, apr_pool_t *plog,
&proxy_hcheck_module); &proxy_hcheck_module);
if (s != ctx->s) { if (s != ctx->s) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(10019) ap_log_error(APLOG_MARK, APLOG_TRACE4, 0, s, APLOGNO(10019)
"We somehow have a context/server mismatch (%pp:%pp)", "Missing unique per-server context: %s (%pp:%pp) (no hchecks)",
s, ctx->s); s->server_hostname, s, ctx->s);
s = s->next; s = s->next;
continue; continue;
} }
@ -1026,7 +1027,7 @@ static int hc_post_config(apr_pool_t *p, apr_pool_t *plog,
return !OK; return !OK;
} }
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(03265) ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(03265)
"watchdog callback registered (%s)", HCHECK_WATHCHDOG_NAME); "watchdog callback registered (%s for %s)", HCHECK_WATHCHDOG_NAME, s->server_hostname);
s = s->next; s = s->next;
} }
return OK; return OK;