BitMaster/main
1
0
Fork 0
mirror of https://github.com/Vateron-Media/XC_VM.git synced 2026-04-11 15:39:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): improve MonitorCommand failure handling and process kill

Browse Source 
- Use >= instead of == for stop_failures threshold (prevents skipping
  the exact failure count if incremented past it)
- Add retry with sleep on stream start failure before goto label76
- Replace shell_exec('kill -9 `ps ...`') with safer xargs pipeline
  that handles empty PID lists gracefully (xargs -r)
This commit is contained in:
Divarion-D
2026-03-17 20:46:31 +03:00
parent bde1ae9506
commit ff58f4c12b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cli/Commands/MonitorCommand.php
View File

@@ -248,10 +248,13 @@ class MonitorCommand implements CommandInterface {
if ((is_numeric($rData) && ($rData == 0))) {
$E9d347a502b13abd = true;
$rMaxFails++;
if (((0 < SettingsManager::getAll()['stop_failures']) && ($rMaxFails == SettingsManager::getAll()['stop_failures']))) {
if (((0 < SettingsManager::getAll()['stop_failures']) && ($rMaxFails >= SettingsManager::getAll()['stop_failures']))) {
echo "Failure limit reached, exiting.\n";
return 0;
}
echo 'Stream start failed (attempt ' . $rMaxFails . '). Sleeping ' . SettingsManager::getAll()['stream_fail_sleep'] . " seconds...\n";
sleep(SettingsManager::getAll()['stream_fail_sleep']);
goto label76;
}
if (!$rData) {
return 0;
@@ -575,7 +578,7 @@ class MonitorCommand implements CommandInterface {
}
if (empty($rPID)) {
shell_exec("kill -9 `ps -ef | grep 'XC_VM\\[" . intval($rStreamID) . "\\]' | grep -v grep | awk '{print \$2}'`;");
shell_exec("ps -ef | grep 'XC_VM\\[" . intval($rStreamID) . "\\]' | grep -v grep | awk '{print \$2}' | xargs -r kill -9 2>/dev/null");
} else {
if (file_exists('/proc/' . $rPID)) {
$rCommand = trim(file_get_contents('/proc/' . $rPID . '/cmdline'));