X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=b2da78f1b3509d9a2ff5f16d147d1efd42c45e3e;hb=da1c13368b55546a0a998abd8aedcc9849b44a09;hp=562502895b6dbe61aac508e7e197a34473d755ff;hpb=322b7c856ca9ba53bd9c7da50dd5c1e3c9197d56;p=friendica.git diff --git a/src/Core/System.php b/src/Core/System.php index 562502895b..b2da78f1b3 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"); + DI::apiResponse()->setType(Response::TYPE_XML); + DI::apiResponse()->addContent(XML::fromArray(["result" => $result], $xml)); + DI::page()->exit(DI::apiResponse()->generate()); - $xmldata = ["result" => $result]; - - echo XML::fromArray($xmldata, $xml); - - 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' => $_SERVER['REQUEST_METHOD'], '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; + self::exit(); + } - 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' => $_SERVER['REQUEST_METHOD'], 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']); + 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,13 +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($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()); + + self::exit(); + } + + /** + * Exit the program execution. */ - public static function jsonExit($x, $content_type = 'application/json', int $options = 0) { - header("Content-type: $content_type"); - echo json_encode($x, $options); + public static function exit() + { + DI::page()->logRuntime(DI::config(), 'exit'); exit(); } @@ -409,12 +435,55 @@ class System return max($load_arr[0], $load_arr[1]); } + /** + * Fetch the load and number of processes + * + * @return array + */ + public static function getLoadAvg(): array + { + if (@is_readable('/proc/loadavg')) { + $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) { @@ -433,8 +502,7 @@ class System case 307: throw new TemporaryRedirectException(); } - - exit(); + self::exit(); } /** @@ -462,30 +530,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; } @@ -499,7 +567,7 @@ class System */ public static function htmlUpdateExit($o) { - header("Content-type: text/html"); + DI::apiResponse()->setType(Response::TYPE_HTML); echo "
\r\n"; // We can remove this hack once Internet Explorer recognises HTML5 natively echo "