Checking for valid CPU average values

Signed-off-by: Patrik Kernstock <info@pkern.at>

1 files changed, 23 insertions, 1 deletions

diff --git a/lib/SystemStatistics.php b/lib/SystemStatistics.php
index dd483a5..1ca6a4b 100644
--- a/lib/SystemStatistics.php
+++ b/lib/SystemStatistics.php
@@ -44,6 +44,7 @@ class SystemStatistics {
 	}
 
 	public function getSystemStatistics() {
+		$processorUsage = $this->getProcessorUsage();
 		$memoryUsage = $this->getMemoryUsage();
 		return [
 			'version' => $this->config->getSystemValue('version'),
@@ -56,7 +57,7 @@ class SystemStatistics {
 			'memcache.locking' => $this->config->getSystemValue('memcache.locking', 'none'),
 			'debug' => $this->config->getSystemValue('debug', false) ? 'yes' : 'no',
 			'freespace' => $this->view->free_space(),
-			'cpuload' => sys_getloadavg(),
+			'cpuload' => $processorUsage["loadavg"],
 			'mem_total' => $memoryUsage['mem_total'],
 			'mem_free' => $memoryUsage['mem_free']
 		];
@@ -94,4 +95,25 @@ class SystemStatistics {
 		];
 	}
 
+	/**
+	 * Get current CPU load average
+	 *
+	 * @return array load average with three values, 1/5/15 minutes average.
+	 */
+	protected function getProcessorUsage() {
+		// get current system load average.
+		$loadavg = sys_getloadavg();
+
+		// check if we got any values back.
+		if (!(is_array($loadavg) && count($loadavg) <= 3)) {
+			// either no array or too few array keys.
+			// returning back zeroes to prevent any errors on JS side.
+			$loadavg = [0, 0, 0];
+		}
+
+		return [
+			'loadavg' => $loadavg
+		];
+	}
+
 }