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

Move Config loading to a service provider (#13927)

Browse Source 
* Move Config loading to a service provider
That way other service providers can depend on it
Move various random listener registrations into the EventServiceProvider
Various startup cleanup

* Config::persist Set live variable before persisting incase db update fail

* Disable strict mode for legacy code (init.php)

* Disable debug after os test data is gathered

* remove Eloquent::boot it is never used

* remove Eloquent::version

* lint fixes

* style fixes

* there is no c_echo here
This commit is contained in:
Tony Murray
2022-04-22 19:12:07 -05:00
committed by GitHub
parent d4479e12dd
commit 014213680f
23 changed files with 251 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
includes/init.php
View File

@@ -30,6 +30,7 @@
use LibreNMS\Authentication\LegacyAuth;
use LibreNMS\Config;
use LibreNMS\Util\Debug;
use LibreNMS\Util\Laravel;
global $vars, $console_color;
@@ -77,22 +78,18 @@ if (module_selected('polling', $init_modules)) {
require_once $install_dir . '/includes/polling/functions.inc.php';
}
if (module_selected('alerts', $init_modules)) {
require_once $install_dir . '/LibreNMS/Alert/RunAlerts.php';
}
Debug::set($debug ?? false); // disable debug initially
// Boot Laravel
if (module_selected('web', $init_modules)) {
\LibreNMS\Util\Laravel::bootWeb(module_selected('auth', $init_modules));
Laravel::bootWeb(module_selected('auth', $init_modules));
} else {
\LibreNMS\Util\Laravel::bootCli();
Laravel::bootCli();
}
Debug::set(false); // disable debug initially (hides legacy errors too)
Debug::set($debug ?? false); // override laravel configured settings (hides legacy errors too)
restore_error_handler(); // disable Laravel error handler
if (! module_selected('nodb', $init_modules)) {
\LibreNMS\DB\Eloquent::boot();
if (! \LibreNMS\DB\Eloquent::isConnected()) {
echo "Could not connect to database, check logs/librenms.log.\n";
@@ -104,18 +101,7 @@ if (! module_selected('nodb', $init_modules)) {
exit;
}
}
// Display config.php errors instead of http 500
$display_bak = ini_get('display_errors');
ini_set('display_errors', 1);
// Load config if not already loaded (which is the case if inside Laravel)
if (! Config::has('install_dir')) {
Config::load();
}
// set display_errors back
ini_set('display_errors', $display_bak);
\LibreNMS\DB\Eloquent::setStrictMode(false); // disable strict mode for legacy code...
if (is_numeric(Config::get('php_memory_limit')) && Config::get('php_memory_limit') > 128) {
ini_set('memory_limit', Config::get('php_memory_limit') . 'M');
@@ -129,15 +115,9 @@ try {
exit();
}
if (module_selected('discovery', $init_modules) && ! \LibreNMS\Util\OS::updateCache(false)) {
// OS::loadAllDefinitions() is called by update_os_cache() if updated, no need to call twice
\LibreNMS\Util\OS::loadAllDefinitions(false, true);
} elseif (module_selected('web', $init_modules)) {
if (module_selected('web', $init_modules)) {
require $install_dir . '/includes/html/vars.inc.php';
\LibreNMS\Util\OS::loadAllDefinitions(! module_selected('nodb', $init_modules), true);
}
if (module_selected('web', $init_modules)) {
require $install_dir . '/includes/html/vars.inc.php';
}
$console_color = new Console_Color2();