You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jk...@apache.org on 2014/08/18 13:51:02 UTC
svn commit: r1618588 - /httpd/httpd/trunk/modules/arch/unix/mod_systemd.c
Author: jkaluza
Date: Mon Aug 18 11:51:01 2014
New Revision: 1618588
URL: http://svn.apache.org/r1618588
Log:
mod_systemd: Use AP_SIG_GRACEFUL instead of SIGWINCH.
Modified:
httpd/httpd/trunk/modules/arch/unix/mod_systemd.c
Modified: httpd/httpd/trunk/modules/arch/unix/mod_systemd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/unix/mod_systemd.c?rev=1618588&r1=1618587&r2=1618588&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/unix/mod_systemd.c (original)
+++ httpd/httpd/trunk/modules/arch/unix/mod_systemd.c Mon Aug 18 11:51:01 2014
@@ -85,6 +85,7 @@ static int systemd_monitor(apr_pool_t *p
/* 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) {
rv = sd_notifyf(0, "READY=1\n"
@@ -94,7 +95,7 @@ static int systemd_monitor(apr_pool_t *p
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(02804)
"sd_notifyf returned an error %d", rv);
}
- kill(mainpid, SIGWINCH);
+ kill(mainpid, AP_SIG_GRACEFUL);
}
}
else {