diff options
| author | Phil Davis <phil.davis@world.inf.org> | 2013-09-02 23:43:54 -0700 |
|---|---|---|
| committer | Phil Davis <phil.davis@world.inf.org> | 2013-09-02 23:43:54 -0700 |
| commit | 98c10c92c2d5d9c406841ed067811f645762733a (patch) | |
| tree | a2fed1b8f2692f98eaeae6fb8b1af46529d95020 /etc | |
| parent | 68b253adeefe0c08b1a633208c2caeb4a849b02d (diff) | |
| download | pfsense-98c10c92c2d5d9c406841ed067811f645762733a.zip pfsense-98c10c92c2d5d9c406841ed067811f645762733a.tar.gz | |
Use new names for get_memory parameters
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/system.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 7e59a59..2104790 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -878,21 +878,21 @@ function system_generate_lighty_config($filename, $lighty_port = $port; $memory = get_memory(); - $avail = $memory[1]; + $realmem = $memory[1]; // Determine web GUI process settings and take into account low memory systems - if ($avail < 255) + if ($realmem < 255) $max_procs = 1; else $max_procs = ($config['system']['webgui']['max_procs']) ? $config['system']['webgui']['max_procs'] : 2; // Ramp up captive portal max procs, assuming each PHP process can consume up to 64MB RAM if ($captive_portal !== false) { - if ($avail > 135 and $avail < 256) { + if ($realmem > 135 and $realmem < 256) { $max_procs += 1; // 2 worker processes - } else if ($avail > 255 and $avail < 513) { + } else if ($realmem > 255 and $realmem < 513) { $max_procs += 2; // 3 worker processes - } else if ($avail > 512) { + } else if ($realmem > 512) { $max_procs += 4; // 6 worker processes } if ($max_procs > 1) @@ -901,7 +901,7 @@ function system_generate_lighty_config($filename, $max_php_children = 1; } else { - if ($avail < 78) + if ($realmem < 78) $max_php_children = 0; else $max_php_children = 1; |
