Adds a setup check for the memory limit
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
This commit is contained in:
parent
080572993e
commit
c2fced4463
|
@ -316,6 +316,15 @@
|
||||||
type: OC.SetupChecks.MESSAGE_TYPE_WARNING
|
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 {
|
} else {
|
||||||
messages.push({
|
messages.push({
|
||||||
msg: t('core', 'Error occurred while checking server setup'),
|
msg: t('core', 'Error occurred while checking server setup'),
|
||||||
|
|
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
|
@ -39,6 +39,7 @@ use OC\DB\Connection;
|
||||||
use OC\DB\MissingIndexInformation;
|
use OC\DB\MissingIndexInformation;
|
||||||
use OC\IntegrityCheck\Checker;
|
use OC\IntegrityCheck\Checker;
|
||||||
use OC\Lock\NoopLockingProvider;
|
use OC\Lock\NoopLockingProvider;
|
||||||
|
use OC\MemoryInfo;
|
||||||
use OCP\AppFramework\Controller;
|
use OCP\AppFramework\Controller;
|
||||||
use OCP\AppFramework\Http\DataDisplayResponse;
|
use OCP\AppFramework\Http\DataDisplayResponse;
|
||||||
use OCP\AppFramework\Http\DataResponse;
|
use OCP\AppFramework\Http\DataResponse;
|
||||||
|
@ -81,6 +82,8 @@ class CheckSetupController extends Controller {
|
||||||
private $lockingProvider;
|
private $lockingProvider;
|
||||||
/** @var IDateTimeFormatter */
|
/** @var IDateTimeFormatter */
|
||||||
private $dateTimeFormatter;
|
private $dateTimeFormatter;
|
||||||
|
/** @var MemoryInfo */
|
||||||
|
private $memoryInfo;
|
||||||
|
|
||||||
public function __construct($AppName,
|
public function __construct($AppName,
|
||||||
IRequest $request,
|
IRequest $request,
|
||||||
|
@ -94,7 +97,8 @@ class CheckSetupController extends Controller {
|
||||||
EventDispatcherInterface $dispatcher,
|
EventDispatcherInterface $dispatcher,
|
||||||
IDBConnection $db,
|
IDBConnection $db,
|
||||||
ILockingProvider $lockingProvider,
|
ILockingProvider $lockingProvider,
|
||||||
IDateTimeFormatter $dateTimeFormatter) {
|
IDateTimeFormatter $dateTimeFormatter,
|
||||||
|
MemoryInfo $memoryInfo) {
|
||||||
parent::__construct($AppName, $request);
|
parent::__construct($AppName, $request);
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
$this->clientService = $clientService;
|
$this->clientService = $clientService;
|
||||||
|
@ -107,6 +111,7 @@ class CheckSetupController extends Controller {
|
||||||
$this->db = $db;
|
$this->db = $db;
|
||||||
$this->lockingProvider = $lockingProvider;
|
$this->lockingProvider = $lockingProvider;
|
||||||
$this->dateTimeFormatter = $dateTimeFormatter;
|
$this->dateTimeFormatter = $dateTimeFormatter;
|
||||||
|
$this->memoryInfo = $memoryInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -529,6 +534,16 @@ Raw output
|
||||||
return function_exists('opcache_get_status');
|
return function_exists('opcache_get_status');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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
|
* @return DataResponse
|
||||||
*/
|
*/
|
||||||
|
@ -565,7 +580,8 @@ Raw output
|
||||||
'isSqliteUsed' => $this->isSqliteUsed(),
|
'isSqliteUsed' => $this->isSqliteUsed(),
|
||||||
'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
|
'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
|
||||||
'isPhpMailerUsed' => $this->isPhpMailerUsed(),
|
'isPhpMailerUsed' => $this->isPhpMailerUsed(),
|
||||||
'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin')
|
'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin'),
|
||||||
|
'isTheMemoryLimitHighEnough' => $this->isTheMemoryLimitHighEnough(),
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue