|
 |
bdaebd |
diff --git a/modules/arch/unix/mod_systemd.c b/modules/arch/unix/mod_systemd.c
|
|
|
bdaebd |
index 7a82a90..6c244b6 100644
|
|
|
bdaebd |
--- a/modules/arch/unix/mod_systemd.c
|
|
|
bdaebd |
+++ b/modules/arch/unix/mod_systemd.c
|
|
|
bdaebd |
@@ -100,6 +100,21 @@ static int systemd_post_config(apr_pool_t *pconf, apr_pool_t *plog,
|
|
|
bdaebd |
return OK;
|
|
|
bdaebd |
}
|
|
|
bdaebd |
|
|
|
bdaebd |
+/* Report the service is ready in post_config, which could be during
|
|
|
bdaebd |
+ * startup or after a reload. The server could still hit a fatal
|
|
|
bdaebd |
+ * startup error after this point during ap_run_mpm(), so this is
|
|
|
bdaebd |
+ * perhaps too early, but by post_config listen() has been called on
|
|
|
bdaebd |
+ * the TCP ports so new connections will not be rejected. There will
|
|
|
bdaebd |
+ * always be a possible async failure event simultaneous to the
|
|
|
bdaebd |
+ * service reporting "ready", so this should be good enough. */
|
|
|
bdaebd |
+static int systemd_post_config_last(apr_pool_t *p, apr_pool_t *plog,
|
|
|
bdaebd |
+ apr_pool_t *ptemp, server_rec *main_server)
|
|
|
bdaebd |
+{
|
|
|
bdaebd |
+ sd_notify(0, "READY=1\n"
|
|
|
bdaebd |
+ "STATUS=Configuration loaded.\n");
|
|
|
bdaebd |
+ return OK;
|
|
|
bdaebd |
+}
|
|
|
bdaebd |
+
|
|
|
bdaebd |
static int systemd_pre_mpm(apr_pool_t *p, ap_scoreboard_e sb_type)
|
|
|
bdaebd |
{
|
|
|
bdaebd |
int rv;
|
|
|
bdaebd |
@@ -187,6 +202,8 @@ static void systemd_register_hooks(apr_pool_t *p)
|
|
|
bdaebd |
ap_hook_pre_config(systemd_pre_config, NULL, NULL, APR_HOOK_LAST);
|
|
|
bdaebd |
/* Grab the listener config. */
|
|
|
bdaebd |
ap_hook_post_config(systemd_post_config, NULL, NULL, APR_HOOK_LAST);
|
|
|
bdaebd |
+ /* Signal service is ready. */
|
|
|
bdaebd |
+ ap_hook_post_config(systemd_post_config_last, NULL, NULL, APR_HOOK_REALLY_LAST);
|
|
|
bdaebd |
/* We know the PID in this hook ... */
|
|
|
bdaebd |
ap_hook_pre_mpm(systemd_pre_mpm, NULL, NULL, APR_HOOK_LAST);
|
|
|
bdaebd |
/* Used to update httpd's status line using sd_notifyf */
|