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

Stop running two queries for the same thing (#5177)

Browse Source
This commit is contained in:
Neil Lathwood
2016-12-16 18:15:13 +00:00
committed by Tony Murray
parent de13f453d6
commit bcae14c7d9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
poller.php
View File

@@ -55,7 +55,7 @@ if ($options['h'] == 'odd') {
if (isset($options['i']) && $options['i'] && isset($options['n'])) {
$where = true;
// FIXME
$query = 'SELECT `device_id` FROM (SELECT @rownum :=0) r,
$query = 'SELECT * FROM (SELECT @rownum :=0) r,
(
SELECT @rownum := @rownum +1 AS rownum, `device_id`
FROM `devices`
@@ -121,11 +121,10 @@ rrdtool_initialize();
echo "Starting polling run:\n\n";
$polled_devices = 0;
if (!isset($query)) {
$query = "SELECT `device_id` FROM `devices` WHERE `disabled` = 0 $where ORDER BY `device_id` ASC";
$query = "SELECT * FROM `devices` WHERE `disabled` = 0 $where ORDER BY `device_id` ASC";
}
foreach (dbFetch($query) as $device) {
$device = dbFetchRow("SELECT * FROM `devices` WHERE `device_id` = " .$device['device_id']);
if ($device['os_group'] == 'cisco') {
$device['vrf_lite_cisco'] = dbFetchRows("SELECT * FROM `vrf_lite_cisco` WHERE `device_id` = " . $device['device_id']);
} else {