Separate convenience function for RRD filename generation; tidy formatting

This commit is contained in:
Paul Gear
2015-06-16 08:27:57 +10:00
parent 96bee67394
commit 0cc75d7d1d
2 changed files with 18 additions and 4 deletions
+16 -2
View File
@@ -1251,7 +1251,8 @@ function ip_exists($ip) {
/*
* convenience function - please use this instead of 'if ($debug) { echo ...; }'
*/
function d_echo($text) {
function d_echo($text)
{
global $debug;
if ($debug) {
echo "$text\n";
@@ -1261,9 +1262,22 @@ function d_echo($text) {
/*
* convenience function - please use this instead of 'if ($debug) { print_r ...; }'
*/
function d_print_r($var) {
function d_print_r($var)
{
global $debug;
if ($debug) {
print_r($var);
}
}
/*
* @return the name of the rrd file for $host's $extra component
* @param host Host name
* @param extra Components of RRD filename - will be separated with "-"
*/
function rrdname($host, $extra)
{
global $config;
return implode("/", array($config['rrd_dir'], $host, safename(implode("-", $extra)).".rrd"));
}