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

fix graph_error function

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2540 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-09-22 13:39:03 +00:00
parent 838617100c
commit acba078399
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
html/includes/functions.inc.php
View File

@@ -20,13 +20,15 @@ function rrdtool_graph($graph_file, $options)
$process = proc_open($command, $descriptorspec, $pipes, $cwd, $env); $process = proc_open($command, $descriptorspec, $pipes, $cwd, $env);
if (is_resource($process)) { if (is_resource($process))
{
// $pipes now looks like this: // $pipes now looks like this:
// 0 => writeable handle connected to child stdin // 0 => writeable handle connected to child stdin
// 1 => readable handle connected to child stdout // 1 => readable handle connected to child stdout
// Any error output will be appended to /tmp/error-output.txt // Any error output will be appended to /tmp/error-output.txt
if ($config['rrdcached']) { if ($config['rrdcached'])
{
fwrite($pipes[0], "graph --daemon " . $config['rrdcached'] . " $graph_file $options"); fwrite($pipes[0], "graph --daemon " . $config['rrdcached'] . " $graph_file $options");
} else { } else {
fwrite($pipes[0], "graph $graph_file $options"); fwrite($pipes[0], "graph $graph_file $options");

4
html/includes/graphs/graph.inc.php
View File

@@ -36,6 +36,8 @@ $vertical = mres($_GET['vertical']);
$legend = mres($_GET['legend']); $legend = mres($_GET['legend']);
$id = mres($_GET['id']); $id = mres($_GET['id']);
$graphfile = $config['temp_dir'] . "/" . strgen() . ".png";
if (isset($config['allow_unauth_graphs']) && $config['allow_unauth_graphs']) if (isset($config['allow_unauth_graphs']) && $config['allow_unauth_graphs'])
{ {
$auth = "1"; ## hardcode auth for all with config function $auth = "1"; ## hardcode auth for all with config function
@@ -54,8 +56,6 @@ $subtype = $graphtype['subtype'];
if ($debug) {print_r($graphtype); } if ($debug) {print_r($graphtype); }
$graphfile = $config['temp_dir'] . "/" . strgen() . ".png";
if (is_file($config['install_dir'] . "/html/includes/graphs/$type/$subtype.inc.php")) if (is_file($config['install_dir'] . "/html/includes/graphs/$type/$subtype.inc.php"))
{ {
if (isset($config['allow_unauth_graphs_cidr']) && count($config['allow_unauth_graphs_cidr']) > 0) if (isset($config['allow_unauth_graphs_cidr']) && count($config['allow_unauth_graphs_cidr']) > 0)