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

Apply fixes from StyleCI (#12117)

Browse Source 
* Apply fixes from StyleCI

* Disable style check
This commit is contained in:
Jellyfrog
2020-09-21 14:54:51 +02:00
committed by GitHub
parent 8ec9183df5
commit 77c531527c
752 changed files with 6238 additions and 5833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
discovery.php
View File

@@ -13,15 +13,15 @@
use LibreNMS\Util\FileLock;
$init_modules = array('discovery');
$init_modules = ['discovery'];
require __DIR__ . '/includes/init.php';
$start = microtime(true);
$sqlparams = array();
$options = getopt('h:m:i:n:d::v::a::q', array('os:','type:'));
$start = microtime(true);
$sqlparams = [];
$options = getopt('h:m:i:n:d::v::a::q', ['os:', 'type:']);
if (!isset($options['q'])) {
echo \LibreNMS\Config::get('project_name')." Discovery\n";
if (! isset($options['q'])) {
echo \LibreNMS\Config::get('project_name') . " Discovery\n";
}
if (isset($options['h'])) {
@@ -40,28 +40,28 @@ if (isset($options['h'])) {
$doing = 'new';
} elseif ($options['h']) {
if (is_numeric($options['h'])) {
$where = "AND `device_id` = '".$options['h']."'";
$where = "AND `device_id` = '" . $options['h'] . "'";
$doing = $options['h'];
} else {
$where = "AND `hostname` LIKE '".str_replace('*', '%', mres($options['h']))."'";
$where = "AND `hostname` LIKE '" . str_replace('*', '%', mres($options['h'])) . "'";
$doing = $options['h'];
}
}//end if
}//end if
if (isset($options['os'])) {
$where .= " AND os = ?";
$sqlparams[] = $options['os'];
$where .= " AND os = ?";
$sqlparams[] = $options['os'];
}
if (isset($options['type'])) {
$where .= " AND type = ?";
$sqlparams[] = $options['type'];
$where .= " AND type = ?";
$sqlparams[] = $options['type'];
}
if (isset($options['i']) && $options['i'] && isset($options['n'])) {
$where .= ' AND MOD(device_id,'.$options['i'].") = '".$options['n']."'";
$doing = $options['n'].'/'.$options['i'];
$where .= ' AND MOD(device_id,' . $options['i'] . ") = '" . $options['n'] . "'";
$doing = $options['n'] . '/' . $options['i'];
}
if (set_debug(isset($options['d'])) || isset($options['v'])) {
@@ -86,7 +86,7 @@ EOH;
\LibreNMS\Util\OS::updateCache(true); // Force update of OS Cache
}
if (!$where) {
if (! $where) {
echo "-h <device id> | <device hostname wildcard> Poll single device\n";
echo "-h odd Poll odd numbered devices (same as -i 2 -n 0)\n";
echo "-h even Poll even numbered devices (same as -i 2 -n 1)\n";
@@ -111,18 +111,18 @@ $module_override = parse_modules('discovery', $options);
$discovered_devices = 0;
if (!empty(\LibreNMS\Config::get('distributed_poller_group'))) {
if (! empty(\LibreNMS\Config::get('distributed_poller_group'))) {
$where .= ' AND poller_group IN(' . \LibreNMS\Config::get('distributed_poller_group') . ')';
}
global $device;
foreach (dbFetch("SELECT * FROM `devices` WHERE disabled = 0 AND snmp_disable = 0 $where ORDER BY device_id DESC", $sqlparams) as $device) {
DeviceCache::setPrimary($device['device_id']);
$discovered_devices += (int)discover_device($device, $module_override);
$discovered_devices += (int) discover_device($device, $module_override);
}
$end = microtime(true);
$run = ($end - $start);
$end = microtime(true);
$run = ($end - $start);
$proctime = substr($run, 0, 5);
if ($discovered_devices) {
@@ -132,7 +132,7 @@ if ($discovered_devices) {
'start' => $start,
'duration' => $proctime,
'devices' => $discovered_devices,
'poller' => \LibreNMS\Config::get('distributed_poller_name')
'poller' => \LibreNMS\Config::get('distributed_poller_name'),
], 'perf_times');
if ($doing === 'new') {
// We have added a new device by this point so we might want to do some other work
@@ -147,13 +147,13 @@ if ($doing === 'new') {
$string = $argv[0] . " $doing " . date(\LibreNMS\Config::get('dateformat.compact')) . " - $discovered_devices devices discovered in $proctime secs";
d_echo("$string\n");
if (!isset($options['q'])) {
if (! isset($options['q'])) {
printStats();
}
logfile($string);
if ($doing !== 'new' && $discovered_devices == 0) {
# No discoverable devices, either down or disabled
// No discoverable devices, either down or disabled
exit(5);
}