mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Changes to improve testing (#9608)
* Reorganize trap tests * Testing db DRIVER to prevent .env from interfering * New code to detect if Laravel is booted. Hopefully more reliable. * WIP external test process * revert module test helper * Use .env in Eloquent::boot() * Fix test database settings loading * fix undefined classes (didn't find the one I needed) * Fix incorrect Config usages And RrdDefinition return type * fix .env loading * use the right DB * slightly more accurate isConnected * Move db_name to DBSetupTest specifically * restore $_SERVER in AuthSSOTest * missed item * WIP * tear down in the correct order. * some testing cleanups * remove check for duplicate event listener, it's not working right * Don't need this change anymore * Implement Log::event to replace legacy function log_event() * fix port tests * fix up tests * remove pointless TrapTestCase class * fix style
This commit is contained in:
@@ -21,6 +21,7 @@ use Illuminate\Database\QueryException;
|
||||
use LibreNMS\Config;
|
||||
use LibreNMS\Exceptions\DatabaseConnectException;
|
||||
use LibreNMS\DB\Eloquent;
|
||||
use LibreNMS\Util\Laravel;
|
||||
|
||||
function dbIsConnected()
|
||||
{
|
||||
@@ -463,11 +464,9 @@ function dbHandleException(QueryException $exception)
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($exception->getTrace() as $trace) {
|
||||
$message .= "\n " . $trace['file'] . ':' . $trace['line'];
|
||||
}
|
||||
$message .= $exception->getTraceAsString();
|
||||
|
||||
if (class_exists('Log')) {
|
||||
if (Laravel::isBooted()) {
|
||||
Log::error($message);
|
||||
} else {
|
||||
c_echo("%rSQL Error!%n ");
|
||||
|
Reference in New Issue
Block a user