tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-25 10:59:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

CS fix in memory_limit detection (MC)

Browse Source
This commit is contained in:
fbsanchez 2021-09-14 18:59:15 +02:00
parent cf3c328d18
commit 8f7e49b0d1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/include/class/ConsoleSupervisor.php
View File

@ -1400,6 +1400,10 @@ class ConsoleSupervisor
$PHPmemory_limit_min = config_return_in_bytes('800M'); $PHPmemory_limit_min = config_return_in_bytes('800M');
$PHPSerialize_precision = ini_get('serialize_precision'); $PHPSerialize_precision = ini_get('serialize_precision');
if (is_metaconsole() === true) {
$PHPmemory_limit_min = config_return_in_bytes('-1');
}
// PhantomJS status. // PhantomJS status.
$phantomjs_dir = io_safe_output($config['phantomjs_bin']); $phantomjs_dir = io_safe_output($config['phantomjs_bin']);
$result_ejecution = exec($phantomjs_dir.'/phantomjs --version'); $result_ejecution = exec($phantomjs_dir.'/phantomjs --version');
@ -1504,6 +1508,11 @@ class ConsoleSupervisor
$url = 'http://php.net/manual/es/ini.core.php#ini.memory-limit'; $url = 'http://php.net/manual/es/ini.core.php#ini.memory-limit';
} }
$recommended_memory = '800M';
if (is_metaconsole() === true) {
$recommended_memory = '-1';
}
$this->notify( $this->notify(
[ [
'type' => 'NOTIF.PHP.MEMORY_LIMIT', 'type' => 'NOTIF.PHP.MEMORY_LIMIT',
@ -1513,7 +1522,7 @@ class ConsoleSupervisor
), ),
'message' => sprintf( 'message' => sprintf(
__('Recommended value is: %s'), __('Recommended value is: %s'),
sprintf(__('%s or greater'), '800M') sprintf(__('%s or greater'), $recommended_memory)
).'<br><br>'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator'), ).'<br><br>'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator'),
'url' => $url, 'url' => $url,
] ]