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

Work on all servers, not just top-level... Each Vhost has its own context and watchdog instance. We may need to revisit this and have just one instance

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1784203 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2017-02-23 20:54:47 +00:00
parent 2deba1fc56
commit 2501a90242
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
modules/proxy/mod_proxy_hcheck.c
View File

@ -960,7 +960,6 @@ static apr_status_t hc_watchdog_callback(int state, void *data,
workers++;
}
}
/* s = s->next; */
}
break;
@ -997,30 +996,33 @@ static int hc_post_config(apr_pool_t *p, apr_pool_t *plog,
"mod_watchdog is required");
return !OK;
}
ctx = (sctx_t *) ap_get_module_config(s->module_config,
&proxy_hcheck_module);
while (s) {
ctx = (sctx_t *) ap_get_module_config(s->module_config,
&proxy_hcheck_module);
rv = hc_watchdog_get_instance(&ctx->watchdog,
HCHECK_WATHCHDOG_NAME,
0, 1, p);
if (rv) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, APLOGNO(03263)
"Failed to create watchdog instance (%s)",
HCHECK_WATHCHDOG_NAME);
return !OK;
rv = hc_watchdog_get_instance(&ctx->watchdog,
HCHECK_WATHCHDOG_NAME,
0, 1, p);
if (rv) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, APLOGNO(03263)
"Failed to create watchdog instance (%s)",
HCHECK_WATHCHDOG_NAME);
return !OK;
}
rv = hc_watchdog_register_callback(ctx->watchdog,
apr_time_from_sec(HCHECK_WATHCHDOG_INTERVAL),
ctx,
hc_watchdog_callback);
if (rv) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, APLOGNO(03264)
"Failed to register watchdog callback (%s)",
HCHECK_WATHCHDOG_NAME);
return !OK;
}
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(03265)
"watchdog callback registered (%s)", HCHECK_WATHCHDOG_NAME);
s = s->next;
}
rv = hc_watchdog_register_callback(ctx->watchdog,
apr_time_from_sec(HCHECK_WATHCHDOG_INTERVAL),
ctx,
hc_watchdog_callback);
if (rv) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, APLOGNO(03264)
"Failed to register watchdog callback (%s)",
HCHECK_WATHCHDOG_NAME);
return !OK;
}
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(03265)
"watchdog callback registered (%s)", HCHECK_WATHCHDOG_NAME);
return OK;
}