lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-18 10:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: fix historic oversight in pid vs. name/pidfile reading related to #6351

Browse Source 
If we kill a process and want to wait for it we will have to cache
the PID file and check this one until it's gone.
This commit is contained in:
Franco Fichtner 2023-02-28 08:47:15 +01:00
parent 501f08c87d
commit 293bf9e88a
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/etc/inc/util.inc
View File

@ -30,49 +30,44 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
require_once("IPv6.inc");
require_once 'IPv6.inc';
function killbyname($procname, $sig = 'TERM', $waitforit = false)
{
if (!is_process_running($procname)) {
return;
}
mwexecf('/bin/pkill -%s %s', array($sig, $procname));
if (!$waitforit) {
return;
}
while (is_process_running($procname)) {
usleep(200 * 1000);
}
_killbypid(shell_safe('/bin/pgrep -anx %s', $procname), $sig, $waitforit);
}
function killbypid($pidfile, $sig = 'TERM', $waitforit = false)
function killbypid($pid_or_file, $sig = 'TERM', $waitforit = false)
{
if (is_numeric($pidfile) && $pidfile > 1) {
mwexecf('/bin/kill -%s %s', array($sig, $pidfile));
} elseif (isvalidpid($pidfile)) {
mwexecf('/bin/pkill -%s -F %s', array($sig, $pidfile));
} else {
$pid = $pid_or_file;
if (strpos($pid_or_file, '/') !== false) {
$pid = trim(@file_get_contents($pid_or_file) ?? '');
}
_killbypid($pid, $sig, $waitforit);
}
function _killbypid($pid, $sig, $waitforit)
{
if (!is_numeric($pid) || $pid <= 1) {
return;
}
mwexecf('/bin/kill -%s %s', [$sig, $pid]);
if (!$waitforit) {
return;
}
while (isvalidpid($pidfile)) {
while (mwexecf('/bin/kill -0 %s', $pid, true) == 0) {
usleep(200 * 1000);
}
}
function isvalidpid($pidfile)
{
if (is_numeric($pidfile) && $pidfile > 1) {
return mwexecf('/bin/kill -0 %s', $pidfile, true) == 0;
} elseif (file_exists($pidfile)) {
if (file_exists($pidfile)) {
return mwexecf('/bin/pgrep -nF %s', $pidfile, true) == 0;
}