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

* modules/arch/unix/mod_systemd.c: Remove IdleShutdown feature which

Browse Source 
was buggy per sf's feedback in 2.4.x backport proposal, and would
  probably be more appropriate outside this module anyway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1872761 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2020-01-14 09:50:29 +00:00
parent fd88f1c0cf
commit 003125c843
1 changed files with 2 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
modules/arch/unix/mod_systemd.c
View File

@ -34,11 +34,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
static int shutdown_timer = 0;
static int shutdown_counter = 0;
static unsigned long bytes_served;
static pid_t mainpid;
static int systemd_pre_config(apr_pool_t *pconf, apr_pool_t *plog, static int systemd_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
apr_pool_t *ptemp) apr_pool_t *ptemp)
{ {
@ -66,11 +61,9 @@ static int systemd_post_config(apr_pool_t *p, apr_pool_t *plog,
static int systemd_pre_mpm(apr_pool_t *p, ap_scoreboard_e sb_type) static int systemd_pre_mpm(apr_pool_t *p, ap_scoreboard_e sb_type)
{ {
mainpid = getpid();
sd_notifyf(0, "READY=1\n" sd_notifyf(0, "READY=1\n"
"STATUS=Processing requests...\n" "STATUS=Processing requests...\n"
"MAINPID=%" APR_PID_T_FMT, mainpid); "MAINPID=%" APR_PID_T_FMT, getpid());
return OK; return OK;
} }
@ -100,23 +93,6 @@ static int systemd_monitor(apr_pool_t *p, server_rec *s)
sload.access_count, sload.idle, sload.busy, sload.access_count, sload.idle, sload.busy,
((float) sload.access_count) / (float) up_time, bps); ((float) sload.access_count) / (float) up_time, bps);
/* Shutdown httpd when nothing is sent for shutdown_timer seconds. */
if (sload.bytes_served == bytes_served) {
/* mpm_common.c: INTERVAL_OF_WRITABLE_PROBES is 10 */
shutdown_counter += 10;
if (shutdown_timer > 0 && shutdown_counter >= shutdown_timer) {
sd_notifyf(0, "READY=1\n"
"STATUS=Stopped as result of IdleShutdown "
"timeout.");
kill(mainpid, AP_SIG_GRACEFUL);
}
}
else {
shutdown_counter = 0;
}
bytes_served = sload.bytes_served;
return DECLINED; return DECLINED;
} }
@ -132,31 +108,12 @@ static void systemd_register_hooks(apr_pool_t *p)
ap_hook_monitor(systemd_monitor, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_monitor(systemd_monitor, NULL, NULL, APR_HOOK_MIDDLE);
} }
static const char *set_shutdown_timer(cmd_parms *cmd, void *dummy,
const char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return err;
}
shutdown_timer = atoi(arg);
return NULL;
}
static const command_rec systemd_cmds[] =
{
AP_INIT_TAKE1("IdleShutdown", set_shutdown_timer, NULL, RSRC_CONF,
"Number of seconds in idle-state after which httpd is shutdown"),
{NULL}
};
AP_DECLARE_MODULE(systemd) = { AP_DECLARE_MODULE(systemd) = {
STANDARD20_MODULE_STUFF, STANDARD20_MODULE_STUFF,
NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL,
systemd_cmds, NULL,
systemd_register_hooks, systemd_register_hooks,
}; };