jenkins-bot has submitted this change and it was merged.
Change subject: Inline doc for $wgMaxShell*
......................................................................
Inline doc for $wgMaxShell*
They are passed to includes/limit.sh which in turns pass them to
'ulimit'. Add the units as inline comments, so I dont have to dig up in
the various script and helps.
Bug: T145819
Change-Id: I0e83fa688bc84fd3b6256c64982630bb73acf0f1
---
M wmf-config/CommonSettings.php
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 636022c..5d7cb80 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1561,9 +1561,11 @@
$wgDisableOutputCompression = true;
}
-$wgMaxShellFileSize = 512 * 1024;
-$wgMaxShellMemory = 1024 * 1024;
-$wgMaxShellTime = 50;
+// Passed to ulimit
+
+$wgMaxShellFileSize = 512 * 1024; // Kilobytes
+$wgMaxShellMemory = 1024 * 1024; // Kilobytes
+$wgMaxShellTime = 50; // seconds
// Use a cgroup for shell execution.
// This will cause shell execution to fail if the cgroup is not installed.
--
To view, visit https://gerrit.wikimedia.org/r/311118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e83fa688bc84fd3b6256c64982630bb73acf0f1
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
