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

65
includes/dbFacile.php
View File

@@ -22,73 +22,8 @@
use Illuminate\Database\QueryException;
use LibreNMS\DB\Eloquent;
use LibreNMS\Exceptions\DatabaseConnectException;
use LibreNMS\Util\Laravel;
/**
* @deprecated Please use Eloquent instead; https://laravel.com/docs/eloquent
* @see https://laravel.com/docs/eloquent
*/
function dbIsConnected()
{
return Eloquent::isConnected();
}
/**
* Connect to the database.
* Will use global config variables if they are not sent: db_host, db_user, db_pass, db_name, db_port, db_socket
*
* @param string $db_host
* @param string $db_user
* @param string $db_pass
* @param string $db_name
* @param string $db_port
* @param string $db_socket
* @return \Illuminate\Database\Connection
*
* @throws DatabaseConnectException
*
* @deprecated Please use Eloquent instead; https://laravel.com/docs/eloquent
* @see https://laravel.com/docs/eloquent
*/
function dbConnect($db_host = null, $db_user = '', $db_pass = '', $db_name = '', $db_port = null, $db_socket = null)
{
if (Eloquent::isConnected()) {
return Eloquent::DB();
}
if (! extension_loaded('pdo_mysql')) {
throw new DatabaseConnectException('PHP pdo_mysql extension not loaded!');
}
try {
if (! is_null($db_host) || ! empty($db_name)) {
// legacy connection override
\Config::set('database.connections.setup', [
'driver' => 'mysql',
'host' => $db_host,
'port' => $db_port,
'database' => $db_name,
'username' => $db_user,
'password' => $db_pass,
'unix_socket' => $db_socket,
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'prefix' => '',
'strict' => true,
'engine' => null,
]);
\Config::set('database.default', 'setup');
}
Eloquent::boot();
} catch (PDOException $e) {
throw new DatabaseConnectException($e->getMessage(), $e->getCode(), $e);
}
return Eloquent::DB();
}
/**
* Performs a query using the given string.
*