summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorMichael Weimann <mail@michael-weimann.eu>2018-08-04 21:53:50 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-08-20 15:24:10 +0200
commitc164409ee7f921a96f95e1fe95d86fe07a98963e (patch)
tree42fc9ded3b31d152242258518366da0c145b570d /settings
parent1d2bc9c45ecbbb7521dbf14dba6560d925691f01 (diff)
downloadnextcloud-server-c164409ee7f921a96f95e1fe95d86fe07a98963e.tar.gz
nextcloud-server-c164409ee7f921a96f95e1fe95d86fe07a98963e.zip
Adds a memory limit warning for console commands if the limit is below the recommended value
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
Diffstat (limited to 'settings')
-rw-r--r--settings/Controller/CheckSetupController.php12
1 files changed, 1 insertions, 11 deletions
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index eca67667471..a64d131648b 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -535,16 +535,6 @@ 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() {
@@ -581,7 +571,7 @@ Raw output
'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
'isPhpMailerUsed' => $this->isPhpMailerUsed(),
'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin'),
- 'isTheMemoryLimitHighEnough' => $this->isTheMemoryLimitHighEnough(),
+ 'isMemoryLimitSufficient' => $this->memoryInfo->isMemoryLimitSufficient(),
]
);
}