X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSystem.php;h=00bdcd455c50e495d5c78587b567e8f664becc76;hb=b9bb525fe91c176ada2323c2d628291a27594d59;hp=10fc5c7d4e335e6cdc725affb1672f93c572ea8d;hpb=23e5ae15e3a1b73cd89f65687db5acca122c5124;p=friendica.git diff --git a/src/Core/System.php b/src/Core/System.php index 10fc5c7d4e..00bdcd455c 100644 --- a/src/Core/System.php +++ b/src/Core/System.php @@ -1,6 +1,6 @@ $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; } } @@ -249,14 +251,14 @@ class System // Don't show multiple calls from the Database classes to show the essential parts of the callstack $func['database'] = in_array($func['class'], ['Friendica\Database\DBA', 'Friendica\Database\Database']); - if (!$previous['database'] || !$func['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; } @@ -292,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(); @@ -319,16 +321,16 @@ 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 - * @param [type] $responce + * @param string $type * @param string|null $content_type * @return void */ - public static function httpExit(string $content, string $responce = Response::TYPE_HTML, ?string $content_type = null) { - DI::apiResponse()->setType($responce, $content_type); + 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()); @@ -369,7 +371,7 @@ class System */ public static function exit() { - DI::page()->logRuntime(); + DI::page()->logRuntime(DI::config(), 'exit'); exit(); } @@ -399,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)) { @@ -435,12 +437,50 @@ class System return max($load_arr[0], $load_arr[1]); } + /** + * Fetch the load and number of processes + * + * @param bool $get_processes + * @return array + */ + 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) && preg_match("#([.\d]+)\s([.\d]+)\s([.\d]+)\s(\d+)/(\d+)#", $content, $matches)) { + $load['runnable'] = (float)$matches[4]; + $load['scheduled'] = (float)$matches[5]; + } + } + + return $load; + } + /** * 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) { @@ -483,34 +523,33 @@ class System * Checks if a given directory is usable for the system * * @param $directory - * @param bool $check_writable * * @return boolean the directory is usable */ - public static function isDirectoryUsable($directory, $check_writable = true) + private static function isDirectoryUsable(string $directory): bool { - if ($directory == '') { - Logger::info('Directory is empty. This shouldn\'t happen.'); + if (empty($directory)) { + 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::info('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()); + if (!is_writable($directory)) { + Logger::warning('Path is not writable', ['directory' => $directory, 'user' => static::getUser()]); return false; } @@ -544,7 +583,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); } @@ -553,18 +592,18 @@ 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); // 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 (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; @@ -587,7 +626,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; } @@ -602,7 +641,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; @@ -616,4 +655,35 @@ class System // Reaching this point means that the operating system is configured badly. return ""; } + + /** + * 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(bool $numeric_id = false): array + { + $rules = []; + $id = 0; + + if (DI::config()->get('system', 'tosdisplay')) { + $rulelist = DI::config()->get('system', 'tosrules') ?: DI::config()->get('system', 'tostext'); + $html = BBCode::convert($rulelist, false, BBCode::EXTERNAL); + + $msg = HTML::toPlaintext($html, 0, true); + foreach (explode("\n", trim($msg)) as $line) { + $line = trim($line); + if ($line) { + if ($numeric_id) { + $rules[++$id] = $line; + } else { + $rules[] = ['id' => (string)++$id, 'text' => $line]; + } + } + } + } + + return $rules; + } }