Add a parameter to pidofFTL() function to allow a delay if necessary

Signed-off-by: RD WebDesign <[email protected]>
stonerl · Apr 10, 2023 · d010187 · d010187
1 parent f6acb8f
commit d010187
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/scripts/pi-hole/php/func.php b/scripts/pi-hole/php/func.php
@@ -693,8 +693,12 @@ function convertUnicodeToIDNA($unicode)
 }
 
 // Return PID of FTL (used in settings.php)
-function pidofFTL()
+function pidofFTL($add_delay = false)
 {
+    if ($add_delay) {
+        usleep(100000);
+    }
+
     return shell_exec('pidof pihole-FTL');
 }
 

diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
@@ -197,6 +197,7 @@ function addStaticDHCPLease($mac, $ip, $hostname)
 
 $error = '';
 $success = '';
+$FTLrestarted = false;
 
 if (isset($_POST['field'])) {
     // Handle CSRF
@@ -445,6 +446,7 @@ function addStaticDHCPLease($mac, $ip, $hostname)
 
         case 'restartdns':
             pihole_execute('-a restartdns');
+            $FTLrestarted = true;
             $success = 'The DNS server has been restarted';
 
             break;
@@ -554,6 +556,7 @@ function addStaticDHCPLease($mac, $ip, $hostname)
 
                 if ($privacylevel > $level) {
                     pihole_execute('-a restartdns');
+                    $FTLrestarted = true;
                     $success .= 'The privacy level has been decreased and the DNS resolver has been restarted';
                 } elseif ($privacylevel < $level) {
                     $success .= 'The privacy level has been increased';

diff --git a/settings.php b/settings.php
@@ -241,7 +241,7 @@
                                     <div class="row">
                                         <div class="col-lg-12">
                                             <?php
-                                            $FTLpid = intval(pidofFTL());
+                                            $FTLpid = intval(pidofFTL($FTLrestarted));
 if ($FTLpid !== 0) {
     $FTLversion = exec('/usr/bin/pihole-FTL version'); ?>
                                             <table class="table table-striped table-bordered nowrap">