mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Move config loading into the Config class. (#8100)

Browse Source 
Self contain dbFacile too.
Update rrdtool default setting to be similar to others.
Move silly cisco-entities.php into entity-physical.inc.php
This commit is contained in:
Tony Murray
2018-02-10 14:38:25 -06:00
committed by Neil Lathwood
parent 363c24a117
commit de56dccc8a
10 changed files with 247 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
includes/init.php
View File

@@ -28,9 +28,12 @@
*/
use LibreNMS\Authentication\Auth;
use LibreNMS\Config;
global $config;
error_reporting(E_ERROR|E_PARSE|E_CORE_ERROR|E_COMPILE_ERROR);
$install_dir = realpath(__DIR__ . '/..');
$config['install_dir'] = $install_dir;
chdir($install_dir);
@@ -65,7 +68,6 @@ if (module_selected('mocksnmp', $init_modules)) {
require_once $install_dir . '/includes/snmp.inc.php';
}
require_once $install_dir . '/includes/services.inc.php';
require_once $install_dir . '/includes/mergecnf.inc.php';
require_once $install_dir . '/includes/functions.php';
require_once $install_dir . '/includes/rewrites.php';
@@ -88,19 +90,11 @@ if (module_selected('alerts', $init_modules)) {
require_once $install_dir . '/includes/alerts.inc.php';
}
// variable definitions
require $install_dir . '/includes/cisco-entities.php';
require $install_dir . '/includes/vmware_guestid.inc.php';
require $install_dir . '/includes/defaults.inc.php';
require $install_dir . '/includes/definitions.inc.php';
// Display config.php errors instead of http 500
$display_bak = ini_get('display_errors');
ini_set('display_errors', 1);
include $install_dir . '/config.php';
if (isset($config['php_memory_limit']) && is_numeric($config['php_memory_limit']) && $config['php_memory_limit'] > 128) {
ini_set('memory_limit', $config['php_memory_limit'].'M');
}
Config::load($install_dir);
// set display_errors back
ini_set('display_errors', $display_bak);
if (!module_selected('nodb', $init_modules)) {
@@ -120,6 +114,8 @@ if (!module_selected('nodb', $init_modules)) {
// Connect to database
try {
dbConnect();
Config::loadFromDatabase();
} catch (\LibreNMS\Exceptions\DatabaseConnectException $e) {
if (isCli()) {
echo 'MySQL Error: ' . $e->getMessage() . PHP_EOL;
@@ -128,15 +124,10 @@ if (!module_selected('nodb', $init_modules)) {
}
exit(2);
}
}
// pull in the database config settings
mergedb();
// load graph types from the database
require $install_dir . '/includes/load_db_graph_types.inc.php';
// Process $config to tidy up
require $install_dir . '/includes/process_config.inc.php';
if (isset($config['php_memory_limit']) && is_numeric($config['php_memory_limit']) && $config['php_memory_limit'] > 128) {
ini_set('memory_limit', $config['php_memory_limit'].'M');
}
try {