X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=0c1e499d939395ac82ec2c5a05451d9873da95a1;hb=4ff7c37f85cdedb3f033bec92228c8ef22def574;hp=8a9cdfb96b3f9ac317b153aa32629aaddebdce35;hpb=543e4be0a61adf0f7717d91dc4436a7be9725ad0;p=friendica.git

diff --git a/src/Core/System.php b/src/Core/System.php
index 8a9cdfb96b..0c1e499d93 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -21,10 +21,9 @@
 
 namespace Friendica\Core;
 
-use Exception;
-use Friendica\App;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\DI;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException\FoundException;
 use Friendica\Network\HTTPException\MovedPermanentlyException;
 use Friendica\Network\HTTPException\TemporaryRedirectException;
@@ -292,13 +291,11 @@ class System
 			Logger::notice('xml_status returning non_zero: ' . $st . " message=" . $message);
 		}
 
-		header("Content-type: text/xml");
-
-		$xmldata = ["result" => $result];
-
-		echo XML::fromArray($xmldata, $xml);
+		DI::apiResponse()->setType(Response::TYPE_XML);
+		DI::apiResponse()->addContent(XML::fromArray(["result" => $result], $xml));
+		DI::page()->exit(DI::apiResponse()->generate());
 
-		exit();
+		self::exit();
 	}
 
 	/**
@@ -309,25 +306,42 @@ class System
 	 * @param string  $content Response body. Optional.
 	 * @throws \Exception
 	 */
-	public static function httpExit($val, $message = '', $content = '')
+	public static function httpError($httpCode, $message = '', $content = '')
 	{
-		if ($val >= 400) {
-			Logger::debug('Exit with error', ['code' => $val, 'message' => $message, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
+		if ($httpCode >= 400) {
+			Logger::debug('Exit with error', ['code' => $httpCode, 'message' => $message, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
 		}
-		header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $message);
+		DI::apiResponse()->setStatus($httpCode, $message);
+		DI::apiResponse()->addContent($content);
 		DI::page()->exit(DI::apiResponse()->generate());
-		echo $content;
 
-		exit();
+		self::exit();
+	}
+
+	/**
+	 * This function adds the content and a content-teype HTTP header to the output.
+	 * After finishing the process is getting killed.
+	 *
+	 * @param string $content
+	 * @param string $type
+	 * @param string|null $content_type
+	 * @return void
+	 */
+	public static function httpExit(string $content, string $type = Response::TYPE_HTML, ?string $content_type = null) {
+		DI::apiResponse()->setType($type, $content_type);
+		DI::apiResponse()->addContent($content);
+		DI::page()->exit(DI::apiResponse()->generate());
+
+		self::exit();
 	}
 
-	public static function jsonError($httpCode, $data, $content_type = 'application/json')
+	public static function jsonError($httpCode, $content, $content_type = 'application/json')
 	{
 		if ($httpCode >= 400) {
 			Logger::debug('Exit with error', ['code' => $httpCode, 'content_type' => $content_type, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
 		}
-		header($_SERVER["SERVER_PROTOCOL"] . ' ' . $httpCode);
-		self::jsonExit($data, $content_type);
+		DI::apiResponse()->setStatus($httpCode);
+		self::jsonExit($content, $content_type);
 	}
 
 	/**
@@ -337,14 +351,25 @@ class System
 	 * and adds an application/json HTTP header to the output.
 	 * After finishing the process is getting killed.
 	 *
-	 * @param mixed   $x The input content.
-	 * @param string  $content_type Type of the input (Default: 'application/json').
-	 * @param integer $options JSON options
+	 * @param mixed   $content      The input content
+	 * @param string  $content_type Type of the input (Default: 'application/json')
+	 * @param integer $options      JSON options
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function jsonExit($x, $content_type = 'application/json', int $options = 0) {
+	public static function jsonExit($content, $content_type = 'application/json', int $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT) {
+		DI::apiResponse()->setType(Response::TYPE_JSON, $content_type);
+		DI::apiResponse()->addContent(json_encode($content, $options));
 		DI::page()->exit(DI::apiResponse()->generate());
-		header("Content-type: $content_type");
-		echo json_encode($x, $options);
+
+		self::exit();
+	}
+
+	/**
+	 * Exit the program execution.
+	 */
+	public static function exit()
+	{
+		DI::page()->logRuntime(DI::config(), 'exit');
 		exit();
 	}
 
@@ -410,12 +435,52 @@ class System
 		return max($load_arr[0], $load_arr[1]);
 	}
 
+	/**
+	 * Fetch the load and number of processes
+	 *
+	 * @return array
+	 */
+	public static function getLoadAvg(): array
+	{
+		$content = @file_get_contents('/proc/loadavg');
+		if (empty($content)) {
+			$content = shell_exec('cat /proc/loadavg');
+		}
+		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]
+		];
+	}
+
 	/**
 	 * Redirects to an external URL (fully qualified URL)
 	 * If you want to route relative to the current Friendica base, use App->internalRedirect()
 	 *
 	 * @param string $url  The new Location to redirect
 	 * @param int    $code The redirection code, which is used (Default is 302)
+	 *
+	 * @throws FoundException
+	 * @throws MovedPermanentlyException
+	 * @throws TemporaryRedirectException
+	 *
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function externalRedirect($url, $code = 302)
 	{
@@ -434,8 +499,7 @@ class System
 			case 307:
 				throw new TemporaryRedirectException();
 		}
-
-		exit();
+		self::exit();
 	}
 
 	/**
@@ -463,30 +527,30 @@ class System
 	 *
 	 * @return boolean the directory is usable
 	 */
-	public static function isDirectoryUsable($directory, $check_writable = true)
+	private static function isDirectoryUsable($directory, $check_writable = true)
 	{
 		if ($directory == '') {
-			Logger::info('Directory is empty. This shouldn\'t happen.');
+			Logger::warning('Directory is empty. This shouldn\'t happen.');
 			return false;
 		}
 
 		if (!file_exists($directory)) {
-			Logger::info('Path "' . $directory . '" does not exist for user ' . static::getUser());
+			Logger::warning('Path does not exist', ['directory' => $directory, 'user' => static::getUser()]);
 			return false;
 		}
 
 		if (is_file($directory)) {
-			Logger::info('Path "' . $directory . '" is a file for user ' . static::getUser());
+			Logger::warning('Path is a file', ['directory' => $directory, 'user' => static::getUser()]);
 			return false;
 		}
 
 		if (!is_dir($directory)) {
-			Logger::info('Path "' . $directory . '" is not a directory for user ' . static::getUser());
+			Logger::warning('Path is not a directory', ['directory' => $directory, 'user' => static::getUser()]);
 			return false;
 		}
 
 		if ($check_writable && !is_writable($directory)) {
-			Logger::info('Path "' . $directory . '" is not writable for user ' . static::getUser());
+			Logger::warning('Path is not writable', ['directory' => $directory, 'user' => static::getUser()]);
 			return false;
 		}
 
@@ -500,7 +564,7 @@ class System
 	 */
 	public static function htmlUpdateExit($o)
 	{
-		header("Content-type: text/html");
+		DI::apiResponse()->setType(Response::TYPE_HTML);
 		echo "<!DOCTYPE html><html><body>\r\n";
 		// We can remove this hack once Internet Explorer recognises HTML5 natively
 		echo "<section>";
@@ -508,7 +572,7 @@ class System
 		echo str_replace("\t", "       ", $o);
 		echo "</section>";
 		echo "</body></html>\r\n";
-		exit();
+		self::exit();
 	}
 
 	/**
@@ -520,7 +584,7 @@ class System
 	{
 		$temppath = DI::config()->get("system", "temppath");
 
-		if (($temppath != "") && System::isDirectoryUsable($temppath)) {
+		if (($temppath != "") && self::isDirectoryUsable($temppath)) {
 			// We have a temp path and it is usable
 			return BasePath::getRealPath($temppath);
 		}
@@ -529,7 +593,7 @@ class System
 		$temppath = sys_get_temp_dir();
 
 		// Check if it is usable
-		if (($temppath != "") && System::isDirectoryUsable($temppath)) {
+		if (($temppath != "") && self::isDirectoryUsable($temppath)) {
 			// Always store the real path, not the path through symlinks
 			$temppath = BasePath::getRealPath($temppath);
 
@@ -540,7 +604,7 @@ class System
 				mkdir($new_temppath);
 			}
 
-			if (System::isDirectoryUsable($new_temppath)) {
+			if (self::isDirectoryUsable($new_temppath)) {
 				// The new path is usable, we are happy
 				DI::config()->set("system", "temppath", $new_temppath);
 				return $new_temppath;
@@ -563,7 +627,7 @@ class System
 	public static function getSpoolPath()
 	{
 		$spoolpath = DI::config()->get('system', 'spoolpath');
-		if (($spoolpath != "") && System::isDirectoryUsable($spoolpath)) {
+		if (($spoolpath != "") && self::isDirectoryUsable($spoolpath)) {
 			// We have a spool path and it is usable
 			return $spoolpath;
 		}
@@ -578,7 +642,7 @@ class System
 				mkdir($spoolpath);
 			}
 
-			if (System::isDirectoryUsable($spoolpath)) {
+			if (self::isDirectoryUsable($spoolpath)) {
 				// The new path is usable, we are happy
 				DI::config()->set("system", "spoolpath", $spoolpath);
 				return $spoolpath;