From f2560c42d1dc34f763678fab67363ba0d0b03c9e Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 2 Mar 2019 18:41:12 +0000
Subject: [PATCH 1/2] Reduce the default maximum load for the worker to 20

---
 mod/admin.php       | 4 ++--
 src/Core/Worker.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index 9486f85c98..39c2e9341b 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1149,7 +1149,7 @@ function admin_page_site_post(App $a)
 	$proxyuser              = (!empty($_POST['proxyuser'])              ? Strings::escapeTags(trim($_POST['proxyuser'])) : '');
 	$proxy                  = (!empty($_POST['proxy'])                  ? Strings::escapeTags(trim($_POST['proxy']))     : '');
 	$timeout                = (!empty($_POST['timeout'])                ? intval(trim($_POST['timeout']))                : 60);
-	$maxloadavg             = (!empty($_POST['maxloadavg'])             ? intval(trim($_POST['maxloadavg']))             : 50);
+	$maxloadavg             = (!empty($_POST['maxloadavg'])             ? intval(trim($_POST['maxloadavg']))             : 20);
 	$maxloadavg_frontend    = (!empty($_POST['maxloadavg_frontend'])    ? intval(trim($_POST['maxloadavg_frontend']))    : 50);
 	$min_memory             = (!empty($_POST['min_memory'])             ? intval(trim($_POST['min_memory']))             : 0);
 	$optimize_max_tablesize = (!empty($_POST['optimize_max_tablesize']) ? intval(trim($_POST['optimize_max_tablesize'])) : 100);
@@ -1649,7 +1649,7 @@ function admin_page_site(App $a)
 		'$proxyuser'              => ['proxyuser', L10n::t("Proxy user"), Config::get('system', 'proxyuser'), ""],
 		'$proxy'                  => ['proxy', L10n::t("Proxy URL"), Config::get('system', 'proxy'), ""],
 		'$timeout'                => ['timeout', L10n::t("Network timeout"), Config::get('system', 'curl_timeout', 60), L10n::t("Value is in seconds. Set to 0 for unlimited \x28not recommended\x29.")],
-		'$maxloadavg'             => ['maxloadavg', L10n::t("Maximum Load Average"), Config::get('system', 'maxloadavg', 50), L10n::t("Maximum system load before delivery and poll processes are deferred - default 50.")],
+		'$maxloadavg'             => ['maxloadavg', L10n::t("Maximum Load Average"), Config::get('system', 'maxloadavg', 20), L10n::t("Maximum system load before delivery and poll processes are deferred - default %d.", 20)],
 		'$maxloadavg_frontend'    => ['maxloadavg_frontend', L10n::t("Maximum Load Average \x28Frontend\x29"), Config::get('system', 'maxloadavg_frontend', 50), L10n::t("Maximum system load before the frontend quits service - default 50.")],
 		'$min_memory'             => ['min_memory', L10n::t("Minimal Memory"), Config::get('system', 'min_memory', 0), L10n::t("Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 \x28deactivated\x29.")],
 		'$optimize_max_tablesize' => ['optimize_max_tablesize', L10n::t("Maximum table size for optimization"), $optimize_max_tablesize, L10n::t("Maximum table size \x28in MB\x29 for the automatic optimization. Enter -1 to disable it.")],
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index ea8f6d2425..a53f4b4646 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -611,7 +611,7 @@ class Worker
 	 */
 	private static function tooMuchWorkers()
 	{
-		$queues = Config::get("system", "worker_queues", 4);
+		$queues = Config::get("system", "worker_queues", 10);
 
 		$maxqueues = $queues;
 
@@ -620,7 +620,7 @@ class Worker
 		// Decrease the number of workers at higher load
 		$load = System::currentLoad();
 		if ($load) {
-			$maxsysload = intval(Config::get("system", "maxloadavg", 50));
+			$maxsysload = intval(Config::get("system", "maxloadavg", 20));
 
 			/* Default exponent 3 causes queues to rapidly decrease as load increases.
 			 * If you have 20 max queues at idle, then you get only 5 queues at 37.1% of $maxsysload.

From 9c507e9577286c757df1946441f30e529082a3c8 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 3 Mar 2019 06:55:10 +0000
Subject: [PATCH 2/2] Added value to settings.config.php

---
 config/settings.config.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/settings.config.php b/config/settings.config.php
index 6e3fa6a894..31e8dbe5b5 100644
--- a/config/settings.config.php
+++ b/config/settings.config.php
@@ -102,6 +102,10 @@ return [
 		//  0 to use internal default (100MB)
 		'optimize_max_tablesize' => -1,
 
+		// maxloadavg (Integer)
+		// Maximum system load before delivery and poll processes are deferred.
+		'maxloadavg' => 20,
+
 		// rino_encrypt (Integer)
 		// Server-to-server private message encryption (RINO).
 		// Encryption will only be provided if this setting is set to a non zero value on both servers.