New parameter to create a share block for display reasons

[friendica.git] / src / Core / System.php

diff --git a/src/Core/System.php b/src/Core/System.php
index f94004a880ab10a047935c653432cb887cc25aab..00bdcd455c50e495d5c78587b567e8f664becc76 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -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;
                        }
@@ -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)) {