Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <benakamoorthi@fastmail.fm>2014-07-16 11:57:59 +0400
committerdiosmosis <benakamoorthi@fastmail.fm>2014-07-16 11:57:59 +0400
commit20a6b713d119eebcb7b4c752232b023ceac0cdb2 (patch)
treea55b3c5294e63c040ea6c7b478bc9d334adab629 /core/CliMulti
parent53e4bc25b025b853a3260e0d108125b3f18917eb (diff)
Fixes #5842, use -x option when invoking ps in asynchronous process execution code so processes that aren't attached to the terminal will be returned. Not using it causes climulti:request commands to fail when being executed by cron on some systems. The command will return early w/ no data.
Diffstat (limited to 'core/CliMulti')
-rw-r--r--core/CliMulti/Process.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/CliMulti/Process.php b/core/CliMulti/Process.php
index 905523cbf2..61b7c35a1c 100644
--- a/core/CliMulti/Process.php
+++ b/core/CliMulti/Process.php
@@ -125,7 +125,7 @@ class Process
}
$lockedPID = trim($content);
- $runningPIDs = explode("\n", trim( `ps -e | awk '{print $1}'` ));
+ $runningPIDs = explode("\n", trim( `ps -ex | awk '{print $1}'` ));
return !empty($lockedPID) && in_array($lockedPID, $runningPIDs);
}