Merge branch 'develop' into task/3954-move-auth-to-src

2018-01-02 19:30:41 -05:00
parent e74dbb3693 1752dfe1c3
commit 9a3e773a9a
54 changed files with 2172 additions and 2028 deletions
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -606,6 +606,7 @@ class Worker
 			$exponent = 3;
 			$slope = $maxworkers / pow($maxsysload, $exponent);
 			$queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
+			$processlist = '';

 			if (Config::get('system', 'worker_debug')) {
 				// Create a list of queue entries grouped by their priority