Restructured replacements

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

diff --git a/src/Core/System.php b/src/Core/System.php
index bbcb3ab09e676040dde145642eeae7ee255f65b5..bf3f247ddd41d65f14b6ad65f4aba2af8f05f682 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -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;
        }
 
        /**
@@ -604,7 +598,7 @@ 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);