X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=00bdcd455c50e495d5c78587b567e8f664becc76;hb=b9bb525fe91c176ada2323c2d628291a27594d59;hp=ec214fea9d26f613e260051903ac09fbbf48d43c;hpb=4db4d1843d19a810f3039558d312f0de030e7d6e;p=friendica.git

diff --git a/src/Core/System.php b/src/Core/System.php
index ec214fea9d..00bdcd455c 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -166,7 +166,7 @@ class System
 		$load = System::currentLoad();
 		if ($load) {
 			if (intval($load) > $maxsysload) {
-				$this->logger->warning('system load for process too high.', ['load' => $load, 'process' => 'backend', 'maxsysload' => $maxsysload]);
+				$this->logger->notice('system load for process too high.', ['load' => $load, 'process' => 'backend', 'maxsysload' => $maxsysload]);
 				return true;
 			}
 		}
@@ -253,12 +253,12 @@ class System
 				$func['database'] = in_array($func['class'], ['Friendica\Database\DBA', 'Friendica\Database\Database']);
 				if (!$previous['database'] || !$func['database']) {
 					$classparts = explode("\\", $func['class']);
-					$callstack[] = array_pop($classparts).'::'.$func['function'];
+					$callstack[] = array_pop($classparts).'::'.$func['function'] . (isset($func['line']) ? ' (' . $func['line'] . ')' : '');
 					$previous = $func;
 				}
 			} elseif (!in_array($func['function'], $ignore)) {
 				$func['database'] = ($func['function'] == 'q');
-				$callstack[] = $func['function'];
+				$callstack[] = $func['function'] . (isset($func['line']) ? ' (' . $func['line'] . ')' : '');
 				$func['class'] = '';
 				$previous = $func;
 			}
@@ -294,7 +294,7 @@ class System
 		}
 
 		DI::apiResponse()->setType(Response::TYPE_XML);
-		DI::apiResponse()->addContent(XML::fromArray(["result" => $result], $xml));
+		DI::apiResponse()->addContent(XML::fromArray(['result' => $result]));
 		DI::page()->exit(DI::apiResponse()->generate());
 
 		self::exit();
@@ -321,7 +321,7 @@ class System
 	}
 
 	/**
-	 * This function adds the content and a content-teype HTTP header to the output.
+	 * This function adds the content and a content-type HTTP header to the output.
 	 * After finishing the process is getting killed.
 	 *
 	 * @param string $content
@@ -401,7 +401,7 @@ class System
 		if (is_bool($prefix) && !$prefix) {
 			$prefix = '';
 		} elseif (empty($prefix)) {
-			$prefix = hash('crc32', DI::baseUrl()->getHostname());
+			$prefix = hash('crc32', DI::baseUrl()->getHost());
 		}
 
 		while (strlen($prefix) < ($size - 13)) {
@@ -445,34 +445,28 @@ class System
 	 */
 	public static function getLoadAvg(bool $get_processes = true): array
 	{
+		$load_arr = sys_getloadavg();
+		if (empty($load_arr)) {
+			return [];
+		}
+
+		$load = [
+			'average1'  => $load_arr[0],
+			'average5'  => $load_arr[1],
+			'average15' => $load_arr[2],
+			'runnable'  => 0,
+			'scheduled' => 0
+		];
+
 		if ($get_processes && @is_readable('/proc/loadavg')) {
 			$content = @file_get_contents('/proc/loadavg');
-			if (empty($content)) {
-				$content = shell_exec('uptime | sed "s/.*averages*: //" | sed "s/,//g"');
+			if (!empty($content) && preg_match("#([.\d]+)\s([.\d]+)\s([.\d]+)\s(\d+)/(\d+)#", $content, $matches)) {
+				$load['runnable']  = (float)$matches[4];
+				$load['scheduled'] = (float)$matches[5];
 			}
 		}
 
-		if (empty($content) || !preg_match("#([.\d]+)\s([.\d]+)\s([.\d]+)\s(\d+)/(\d+)#", $content, $matches)) {
-			$load_arr = sys_getloadavg();
-			if (empty($load_arr)) {
-				return [];
-			}
-			return [
-				'average1'  => $load_arr[0],
-				'average5'  => $load_arr[1],
-				'average15' => $load_arr[2],
-				'runnable'  => 0,
-				'scheduled' => 0
-			];
-		}
-
-		return [
-			'average1'  => (float)$matches[1],
-			'average5'  => (float)$matches[2],
-			'average15' => (float)$matches[3],
-			'runnable'  => (float)$matches[4],
-			'scheduled' => (float)$matches[5]
-		];
+		return $load;
 	}
 
 	/**
@@ -529,19 +523,18 @@ class System
 	 * Checks if a given directory is usable for the system
 	 *
 	 * @param      $directory
-	 * @param bool $check_writable
 	 *
 	 * @return boolean the directory is usable
 	 */
-	private static function isDirectoryUsable($directory, $check_writable = true)
+	private static function isDirectoryUsable(string $directory): bool
 	{
-		if ($directory == '') {
+		if (empty($directory)) {
 			Logger::warning('Directory is empty. This shouldn\'t happen.');
 			return false;
 		}
 
 		if (!file_exists($directory)) {
-			Logger::warning('Path does not exist', ['directory' => $directory, 'user' => static::getUser()]);
+			Logger::info('Path does not exist', ['directory' => $directory, 'user' => static::getUser()]);
 			return false;
 		}
 
@@ -555,7 +548,7 @@ class System
 			return false;
 		}
 
-		if ($check_writable && !is_writable($directory)) {
+		if (!is_writable($directory)) {
 			Logger::warning('Path is not writable', ['directory' => $directory, 'user' => static::getUser()]);
 			return false;
 		}
@@ -604,10 +597,10 @@ class System
 			$temppath = BasePath::getRealPath($temppath);
 
 			// To avoid any interferences with other systems we create our own directory
-			$new_temppath = $temppath . "/" . DI::baseUrl()->getHostname();
+			$new_temppath = $temppath . "/" . DI::baseUrl()->getHost();
 			if (!is_dir($new_temppath)) {
 				/// @TODO There is a mkdir()+chmod() upwards, maybe generalize this (+ configurable) into a function/method?
-				mkdir($new_temppath);
+				@mkdir($new_temppath);
 			}
 
 			if (self::isDirectoryUsable($new_temppath)) {
@@ -665,10 +658,11 @@ class System
 
 	/**
 	 * Fetch the system rules
+	 * @param bool $numeric_id If set to "true", the rules are returned with a numeric id as key.
 	 *
 	 * @return array
 	 */
-	public static function getRules(): array
+	public static function getRules(bool $numeric_id = false): array
 	{
 		$rules = [];
 		$id    = 0;
@@ -681,7 +675,11 @@ class System
 			foreach (explode("\n", trim($msg)) as $line) {
 				$line = trim($line);
 				if ($line) {
-					$rules[] = ['id' => (string)++$id, 'text' => $line];
+					if ($numeric_id) {
+						$rules[++$id] = $line;
+					} else {
+						$rules[] = ['id' => (string)++$id, 'text' => $line];
+					}
 				}
 			}
 		}