Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-28 12:44:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't rely on PID file, but try to detect FTL PID ourselves (has shown to be very effective in the update service file)

Browse Source
This commit is contained in:
DL6ER
2017-04-20 13:20:36 +02:00
parent c7693fd674
commit b3cbd29ed7
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/pi-hole/php/FTL.php
View File

@@ -8,7 +8,8 @@
function testFTL()
{
return (strpos(exec("ps -p `cat /var/run/pihole-FTL.pid` -o comm="), "pihole-FTL") !== false);
$ret = shell_exec("pidof pihole-FTL");
return intval($ret);
}
function connectFTL($address, $port=4711, $quiet=true)

8
scripts/pi-hole/php/header.php
View File

@@ -146,12 +146,12 @@
}
}
$FTL = false;
$FTLpid = file_get_contents("/var/run/pihole-FTL.pid");
if (file_exists( "/proc/".$FTLpid ))
function pidofFTL()
{
$FTL = true;
return shell_exec("pidof pihole-FTL");
}
$FTLpid = intval(pidofFTL());
$FTL = ($FTLpid !== 0 ? true : false);
?>
<!DOCTYPE html>