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

Hook up librenms cli debug (#9632)

Browse Source 
* Hook up librenms cli debug

* forgot to add function exists check, good travis-ci :)
This commit is contained in:
Tony Murray
2019-01-09 19:36:32 -06:00
committed by GitHub
parent 8174b9a13c
commit 5cdc49df1b
4 changed files with 83 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LibreNMS/Util/Laravel.php
View File

@@ -83,7 +83,7 @@ class Laravel
public static function enableCliDebugOutput()
{
if (class_exists('Log')) {
if (class_exists('\Log')) {
$logger = Log::getMonolog();
// only install if not existing

14
app/Console/Kernel.php
View File

@@ -51,4 +51,18 @@ class Kernel extends ConsoleKernel
return $this->artisan;
}
public function handle($input, $output = null)
{
// intercept input and check for debug
if ($input->hasParameterOption(['-d', '--debug', '-vv', '-vvv'], true)) {
if ($input->hasParameterOption(['-vvv'], true)) {
global $vdebug;
$vdebug = true;
}
$this->app->booted('set_debug');
}
return parent::handle($input, $output);
}
}

58
includes/functions.php
View File

@@ -24,40 +24,42 @@ use LibreNMS\Exceptions\SnmpVersionUnsupportedException;
use LibreNMS\Util\MemcacheLock;
use Symfony\Component\Process\Process;
/**
* Set debugging output
*
* @param bool $state If debug is enabled or not
* @param bool $silence When not debugging, silence every php error
* @return bool
*/
function set_debug($state = true, $silence = false)
{
global $debug;
if (!function_exists('set_debug')) {
/**
* Set debugging output
*
* @param bool $state If debug is enabled or not
* @param bool $silence When not debugging, silence every php error
* @return bool
*/
function set_debug($state = true, $silence = false)
{
global $debug;
$debug = $state; // set to global
$debug = $state; // set to global
restore_error_handler(); // disable Laravel error handler
restore_error_handler(); // disable Laravel error handler
if (isset($debug) && $debug) {
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
ini_set('log_errors', 0);
error_reporting(E_ALL & ~E_NOTICE);
if (isset($debug) && $debug) {
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
ini_set('log_errors', 0);
error_reporting(E_ALL & ~E_NOTICE);
\LibreNMS\Util\Laravel::enableCliDebugOutput();
\LibreNMS\Util\Laravel::enableQueryDebug();
} else {
ini_set('display_errors', 0);
ini_set('display_startup_errors', 0);
ini_set('log_errors', 1);
error_reporting($silence ? 0 : E_ERROR);
\LibreNMS\Util\Laravel::enableCliDebugOutput();
\LibreNMS\Util\Laravel::enableQueryDebug();
} else {
ini_set('display_errors', 0);
ini_set('display_startup_errors', 0);
ini_set('log_errors', 1);
error_reporting($silence ? 0 : E_ERROR);
\LibreNMS\Util\Laravel::disableCliDebugOutput();
\LibreNMS\Util\Laravel::disableQueryDebug();
\LibreNMS\Util\Laravel::disableCliDebugOutput();
\LibreNMS\Util\Laravel::disableQueryDebug();
}
return $debug;
}
return $debug;
}//end set_debug()
function array_sort_by_column($array, $on, $order = SORT_ASC)

38
includes/helpers.php
View File

@@ -46,3 +46,41 @@ if (!function_exists('d_echo')) {
}
}
}
if (!function_exists('set_debug')) {
/**
* Set debugging output
*
* @param bool $state If debug is enabled or not
* @param bool $silence When not debugging, silence every php error
* @return bool
*/
function set_debug($state = true, $silence = false)
{
global $debug;
$debug = $state; // set to global
restore_error_handler(); // disable Laravel error handler
if ($debug) {
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
ini_set('log_errors', 0);
error_reporting(E_ALL & ~E_NOTICE);
\LibreNMS\Util\Laravel::enableCliDebugOutput();
\LibreNMS\Util\Laravel::enableQueryDebug();
} else {
ini_set('display_errors', 0);
ini_set('display_startup_errors', 0);
ini_set('log_errors', 1);
error_reporting($silence ? 0 : E_ERROR);
\LibreNMS\Util\Laravel::disableCliDebugOutput();
\LibreNMS\Util\Laravel::disableQueryDebug();
}
return $debug;
}
}