revert r1957 patch

git-svn-id: http://www.observium.org/svn/observer/trunk@1960 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-23 09:54:56 +00:00
parent 459af33c43
commit de7ff537cc
43 changed files with 3461 additions and 3452 deletions
+17 -17
View File
@@ -2,53 +2,53 @@
function rrdtool_update($rrdfile, $rrdupdate)
{
return rrdtool("update", $rrdfile, $rrdupdate);
return rrdtool("update", $rrdfile, $rrdupdate);
}
function rrdtool_create($rrdfile, $rrdupdate)
{
global $config; global $debug;
global $config; global $debug;
$command = $config['rrdtool'] . " create $rrdfile $rrdupdate";
$command = $config['rrdtool'] . " create $rrdfile $rrdupdate";
if ($debug) { echo($command."\n"); }
if ($debug) { echo($command."\n"); }
return shell_exec($command);
return shell_exec($command);
}
function rrdtool_fetch($rrdfile, $rrdupdate)
{
return rrdtool("fetch", $rrdfile, $rrdupdate);
return rrdtool("fetch", $rrdfile, $rrdupdate);
}
function rrdtool_graph($rrdfile, $rrdupdate)
{
return rrdtool("graph", $rrdfile, $rrdupdate);
return rrdtool("graph", $rrdfile, $rrdupdate);
}
function rrdtool_last($rrdfile, $rrdupdate)
{
return rrdtool("last", $rrdfile, $rrdupdate);
return rrdtool("last", $rrdfile, $rrdupdate);
}
function rrdtool_lastupdate($rrdfile, $rrdupdate)
{
return rrdtool("lastupdate", $rrdfile, $rrdupdate);
return rrdtool("lastupdate", $rrdfile, $rrdupdate);
}
function rrdtool($command, $file, $options)
{
global $config; global $debug;
global $config; global $debug;
$command = $config['rrdtool'] . " $command $file $options";
if ($config['rrdcached'])
{
$command .= " --daemon " . $config['rrdcached'];
}
$command = $config['rrdtool'] . " $command $file $options";
if ($config['rrdcached'])
{
$command .= " --daemon " . $config['rrdcached'];
}
if ($debug) { echo($command."\n"); }
return shell_exec($command);
if ($debug) { echo($command."\n"); }
return shell_exec($command);
}
?>