From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] apache: Fixes bug13656 - Add delay between stop & start of
 restart command.
Date: Wed, 24 Apr 2024 17:56:51 +0200
Message-ID: <20240424155651.3426712-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2158634146526929451=="
List-Id: <development.lists.ipfire.org>

--===============2158634146526929451==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- The change of the apache initscript in CU181 made the restart comand a stop=
 followed by a
   start. From bug13656 it looks like when the start is run the pid file may =
not yet be
   fully removed and so apache is not started, although the pid is being remo=
ved.
- This patch checks if the pid file is still present every second up to 10 se=
conds. Once the
   pid file is gone then the stop command is completed and the initscript mov=
es to the start
   command.
- Rather than apply a fixed delay of 2 or 3 or 4 seconds I used a while loop =
to check every
   second if the file is still present. If at the end of 10 seconds it is sti=
ll present
   then something went wrong with the pid removal.
- I have tested this patch on my vm system and it worked but it would be good=
 to be
   reviewed to make sure that it is a reasonable approach that has been used =
and if required
   changed in whatever way makes the best sense.

Fixes: Bug13656
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 src/initscripts/system/apache | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/initscripts/system/apache b/src/initscripts/system/apache
index 18eb86e2f..087e4084e 100644
--- a/src/initscripts/system/apache
+++ b/src/initscripts/system/apache
@@ -2,7 +2,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2022  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2024  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -87,6 +87,16 @@ case "$1" in
 	stop)
 		boot_mesg "Stopping Apache daemon..."
 		/usr/sbin/apachectl -k stop
+		COUNTER=3D0
+		while [ -e /var/run/httpd.pid ]
+		do
+			sleep 1
+			(( COUNTER++ ))
+			if [ $COUNTER -eq 10 ]; then
+				boot_mesg "pid not removed after 10 seconds"
+				break
+			fi
+		done
 		evaluate_retval
 		;;
=20
--=20
2.44.0


--===============2158634146526929451==--