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

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Veyssier <eneiluj@posteo.net>2020-10-13 13:19:54 +0300
committerJulien Veyssier <eneiluj@posteo.net>2020-10-13 13:19:54 +0300
commitda602546678930e948af62150db668bba508fa16 (patch)
treeeae46b8f35b83a0563b3041e338de844b1c83a61 /lib/MatterbridgeManager.php
parent7cd30b6621ece94936d84e6929c39603aa007f24 (diff)
make isRunning work with busybox ps
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Diffstat (limited to 'lib/MatterbridgeManager.php')
-rw-r--r--lib/MatterbridgeManager.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/MatterbridgeManager.php b/lib/MatterbridgeManager.php
index 7de5a41c3..8c5648444 100644
--- a/lib/MatterbridgeManager.php
+++ b/lib/MatterbridgeManager.php
@@ -744,8 +744,8 @@ class MatterbridgeManager {
*/
private function isRunning(int $pid): bool {
try {
- $result = shell_exec(sprintf('ps %d', $pid));
- if (count(explode("\n", $result)) > 2) {
+ $result = shell_exec(sprintf('ps x -o user,pid,args | awk \'{print $2}\' | grep %d | wc -l', $pid));
+ if ((int) $result > 0) {
return true;
}
} catch (\Exception $e) {