From 87d3fc7285dd62d94e0e88f27ed60ebd4a91e361 Mon Sep 17 00:00:00 2001 From: Vitali Kari Date: Wed, 18 Sep 2019 14:29:58 +0200 Subject: [PATCH] sensors sometime not clean up (#10611) * do not discover dbm sensors on shutdown ports * rename confusing name from $sensor_type to $sensor_class * Revert "do not discover dbm sensors on shutdown ports" This reverts commit 46963f746aa441c8bfac97c7253dd2ec2e4fbf23. --- includes/discovery/functions.inc.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php index 12eda3fadd..1b8415df96 100644 --- a/includes/discovery/functions.inc.php +++ b/includes/discovery/functions.inc.php @@ -1159,9 +1159,9 @@ function dynamic_discovery_get_value($name, $index, $discovery_data, $pre_cache, */ function sensors($types, $device, $valid, $pre_cache = array()) { - foreach ((array)$types as $sensor_type) { - echo ucfirst($sensor_type) . ': '; - $dir = Config::get('install_dir') . '/includes/discovery/sensors/' . $sensor_type .'/'; + foreach ((array)$types as $sensor_class) { + echo ucfirst($sensor_class) . ': '; + $dir = Config::get('install_dir') . '/includes/discovery/sensors/' . $sensor_class .'/'; if (is_file($dir . $device['os_group'] . '.inc.php')) { include $dir . $device['os_group'] . '.inc.php'; @@ -1174,9 +1174,9 @@ function sensors($types, $device, $valid, $pre_cache = array()) include $dir . '/rfc1628.inc.php'; } } - discovery_process($valid, $device, $sensor_type, $pre_cache); - d_echo($valid['sensor'][$sensor_type]); - check_valid_sensors($device, $sensor_type, $valid['sensor']); + discovery_process($valid, $device, $sensor_class, $pre_cache); + d_echo($valid['sensor'][$sensor_class]); + check_valid_sensors($device, $sensor_class, $valid['sensor']); echo "\n"; } }