mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
-O does not exists in RRDTool < 1.4.3 (CentOS 6 uses 1.3.8 by default).
Checking RRD existence with file_exists() if RRDTool ver. < 1.5
This commit is contained in:
@@ -152,7 +152,7 @@ function rrdtool_graph($graph_file, $options)
|
||||
function rrdtool($command, $filename, $options, $timeout = 0)
|
||||
{
|
||||
global $config, $debug, $rrd_pipes, $console_color;
|
||||
|
||||
|
||||
// do not ovewrite files when creating
|
||||
if ($command == 'create') {
|
||||
$options .= ' -O';
|
||||
@@ -181,9 +181,9 @@ function rrdtool($command, $filename, $options, $timeout = 0)
|
||||
$output = array(null, null);
|
||||
} elseif ($command == 'create' &&
|
||||
version_compare($config['rrdtool_version'], '1.5', '<') &&
|
||||
file_exists($filename)
|
||||
is_file($filename)
|
||||
) { // do not ovewrite RRD if already exist and RRDTool ver. < 1.5
|
||||
print $console_color->convert('[%yRRD file ' . $filename . ' already exist%n]');
|
||||
d_echo('[RRD file ' . $filename . ' already exist]');
|
||||
$output = array(null, null);
|
||||
} else {
|
||||
if ($timeout > 0 && stream_select($r = $rrd_pipes, $w = null, $x = null, 0)) {
|
||||
|
||||
Reference in New Issue
Block a user