X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FProcess.php;h=447d312d44d3e20bc152d85d1f761c52b5a2c55f;hb=56a77f5275ba8566a37d690ade0e929c88b828e2;hp=08284b211bdd12b9714c19f74b8e03342eac60e9;hpb=cdb61be06fd8571d1cbd18c875b8f69ea01295a0;p=friendica.git

diff --git a/src/Core/Process.php b/src/Core/Process.php
index 08284b211b..447d312d44 100644
--- a/src/Core/Process.php
+++ b/src/Core/Process.php
@@ -67,14 +67,25 @@ class Process
 	 */
 	private $pid;
 
-	public function __construct(LoggerInterface $logger, App\Mode $mode, IConfig $config, Model\Process $processModel, string $basepath)
+	public function __construct(LoggerInterface $logger, App\Mode $mode, IConfig $config, Model\Process $processModel, string $basepath, int $pid)
 	{
 		$this->logger = $logger;
 		$this->mode = $mode;
 		$this->config = $config;
 		$this->basePath = $basepath;
 		$this->processModel = $processModel;
-		$this->pid = getmypid();
+		$this->pid = $pid;
+	}
+
+	/**
+	 * Set the process id
+	 *
+	 * @param integer $pid
+	 * @return void
+	 */
+	public function setPid(int $pid)
+	{
+		$this->pid = $pid;
 	}
 
 	/**
@@ -179,7 +190,7 @@ class Process
 		$reached = ($free < $min_memory);
 
 		if ($reached) {
-			$this->logger->debug('Minimal memory reached.', ['free' => $free, 'memtotal' => $meminfo['MemTotal'], 'limit' => $min_memory]);
+			$this->logger->warning('Minimal memory reached.', ['free' => $free, 'memtotal' => $meminfo['MemTotal'], 'limit' => $min_memory]);
 		}
 
 		return $reached;
@@ -209,7 +220,7 @@ class Process
 		$load = System::currentLoad();
 		if ($load) {
 			if (intval($load) > $maxsysload) {
-				$this->logger->info('system load for process too high.', ['load' => $load, 'process' => $process, 'maxsysload' => $maxsysload]);
+				$this->logger->warning('system load for process too high.', ['load' => $load, 'process' => $process, 'maxsysload' => $maxsysload]);
 				return true;
 			}
 		}
@@ -225,6 +236,7 @@ class Process
 	public function run($command, $args)
 	{
 		if (!function_exists('proc_open')) {
+			$this->logger->warning('"proc_open" not available - quitting');
 			return;
 		}
 
@@ -242,6 +254,7 @@ class Process
 		}
 
 		if ($this->isMinMemoryReached()) {
+			$this->logger->warning('Memory limit reached - quitting');
 			return;
 		}
 
@@ -251,9 +264,11 @@ class Process
 			$resource = proc_open($cmdline . ' &', [], $foo, $this->basePath);
 		}
 		if (!is_resource($resource)) {
-			$this->logger->debug('We got no resource for command.', ['cmd' => $cmdline]);
+			$this->logger->warning('We got no resource for command.', ['command' => $cmdline]);
 			return;
 		}
 		proc_close($resource);
+
+		$this->logger->info('Executed "proc_open"', ['command' => $cmdline, 'callstack' => System::callstack(10)]);
 	}
 }