Replace "notice" calls

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

diff --git a/src/Core/System.php b/src/Core/System.php
index 8712b6ca5965f1a5820bd6544957ef6508df7a7e..0c1e499d939395ac82ec2c5a05451d9873da95a1 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -323,12 +323,12 @@ class System
         * 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());
 
@@ -435,6 +435,40 @@ 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()
@@ -493,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;
                }
 
@@ -550,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);
                }
@@ -559,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);
 
@@ -570,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;
@@ -593,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;
                }
@@ -608,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;