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

Use Config helper (#10339)

Browse Source 
remove usage of global variable
This commit is contained in:
Tony Murray
2019-06-23 00:29:12 -05:00
committed by GitHub
parent 342acf50f1
commit f3ba8947f7
367 changed files with 1589 additions and 1857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
LibreNMS/RRD/RrdDefinition.php
View File

@@ -25,6 +25,7 @@
namespace LibreNMS\RRD;
use LibreNMS\Config;
use LibreNMS\Exceptions\InvalidRrdTypeException;
class RrdDefinition
@@ -53,8 +54,6 @@ class RrdDefinition
*/
public function addDataset($name, $type, $min = null, $max = null, $heartbeat = null)
{
global $config;
if (empty($name)) {
d_echo("DS must be set to a non-empty string.");
}
@@ -62,7 +61,7 @@ class RrdDefinition
$ds = array();
$ds[] = $this->escapeName($name);
$ds[] = $this->checkType($type);
$ds[] = is_null($heartbeat) ? $config['rrd']['heartbeat'] : $heartbeat;
$ds[] = is_null($heartbeat) ? Config::get('rrd.heartbeat') : $heartbeat;
$ds[] = is_null($min) ? 'U' : $min;
$ds[] = is_null($max) ? 'U' : $max;