diff options
author | Michael Weimann <mail@michael-weimann.eu> | 2018-08-04 20:39:39 +0200 |
---|---|---|
committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-08-20 15:24:10 +0200 |
commit | c2fced446396dad822404f3fae3ccb1c7df0dc89 (patch) | |
tree | 0d6daa452cd69b27ae534adcd92499747cde7e00 | |
parent | 080572993e891a76721f4f7a7b76c85bc0e4c65d (diff) | |
download | nextcloud-server-c2fced446396dad822404f3fae3ccb1c7df0dc89.tar.gz nextcloud-server-c2fced446396dad822404f3fae3ccb1c7df0dc89.zip |
Adds a setup check for the memory limit
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
-rw-r--r-- | core/js/setupchecks.js | 9 | ||||
-rw-r--r-- | lib/private/MemoryInfo.php | 47 | ||||
-rw-r--r-- | settings/Controller/CheckSetupController.php | 20 |
3 files changed, 74 insertions, 2 deletions
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 93072981e99..f7ee8c73c81 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -316,6 +316,15 @@ type: OC.SetupChecks.MESSAGE_TYPE_WARNING }); } + if (!data.isTheMemoryLimitHighEnough) { + messages.push({ + msg: t( + 'core', + 'The PHP memory limit is below the recommended value of 512MB.' + ), + type: OC.SetupChecks.MESSAGE_TYPE_WARNING + }) + } } else { messages.push({ msg: t('core', 'Error occurred while checking server setup'), diff --git a/lib/private/MemoryInfo.php b/lib/private/MemoryInfo.php new file mode 100644 index 00000000000..14865ed682e --- /dev/null +++ b/lib/private/MemoryInfo.php @@ -0,0 +1,47 @@ +<?php + +namespace OC; + +/** + * Helper class that covers memory info. + */ +class MemoryInfo { + /** + * Returns the php memory limit. + * + * @return int The memory limit in bytes. + */ + public function getMemoryLimit(): int { + $iniValue = trim(ini_get('memory_limit')); + if ($iniValue === '-1') { + return -1; + } else if (is_numeric($iniValue) === true) { + return (int)$iniValue; + } else { + return $this->memoryLimitToBytes($iniValue); + } + } + + /** + * Converts the ini memory limit to bytes. + * + * @param string $memoryLimit The "memory_limit" ini value + * @return int + */ + private function memoryLimitToBytes(string $memoryLimit): int { + $last = strtolower(substr($memoryLimit, -1)); + $memoryLimit = (int)substr($memoryLimit, 0, -1); + + // intended fall trough + switch($last) { + case 'g': + $memoryLimit *= 1024; + case 'm': + $memoryLimit *= 1024; + case 'k': + $memoryLimit *= 1024; + } + + return $memoryLimit; + } +} diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index c706d6e7350..eca67667471 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -39,6 +39,7 @@ use OC\DB\Connection; use OC\DB\MissingIndexInformation; use OC\IntegrityCheck\Checker; use OC\Lock\NoopLockingProvider; +use OC\MemoryInfo; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\DataDisplayResponse; use OCP\AppFramework\Http\DataResponse; @@ -81,6 +82,8 @@ class CheckSetupController extends Controller { private $lockingProvider; /** @var IDateTimeFormatter */ private $dateTimeFormatter; + /** @var MemoryInfo */ + private $memoryInfo; public function __construct($AppName, IRequest $request, @@ -94,7 +97,8 @@ class CheckSetupController extends Controller { EventDispatcherInterface $dispatcher, IDBConnection $db, ILockingProvider $lockingProvider, - IDateTimeFormatter $dateTimeFormatter) { + IDateTimeFormatter $dateTimeFormatter, + MemoryInfo $memoryInfo) { parent::__construct($AppName, $request); $this->config = $config; $this->clientService = $clientService; @@ -107,6 +111,7 @@ class CheckSetupController extends Controller { $this->db = $db; $this->lockingProvider = $lockingProvider; $this->dateTimeFormatter = $dateTimeFormatter; + $this->memoryInfo = $memoryInfo; } /** @@ -530,6 +535,16 @@ Raw output } /** + * Tests if the php memory limit is high enough. + * + * @return bool True if more than 512 MB available, else false. + */ + protected function isTheMemoryLimitHighEnough(): bool { + $memoryLimit = $this->memoryInfo->getMemoryLimit(); + return $memoryLimit === -1 || $memoryLimit >= 512 * 1024 * 1024; + } + + /** * @return DataResponse */ public function check() { @@ -565,7 +580,8 @@ Raw output 'isSqliteUsed' => $this->isSqliteUsed(), 'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'), 'isPhpMailerUsed' => $this->isPhpMailerUsed(), - 'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin') + 'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin'), + 'isTheMemoryLimitHighEnough' => $this->isTheMemoryLimitHighEnough(), ] ); } |