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

Removed -O parameter from rrdtool command line.

Browse Source 
-O does not exists in RRDTool < 1.4.3 (CentOS 6 uses 1.3.8 by default).
Checking RRD file existence with file_exists() instead.
This commit is contained in:
Vladislav Solovei
2016-08-15 12:41:32 +03:00
parent 2615d4abc1
commit 4c324cb5b3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
includes/rrdtool.inc.php
View File

@@ -153,10 +153,6 @@ function rrdtool($command, $filename, $options, $timeout = 0)
{ {
global $config, $debug, $rrd_pipes, $console_color; global $config, $debug, $rrd_pipes, $console_color;
// do not ovewrite files when creating
if ($command == 'create') {
$options .= ' -O';
}
// rrdcached commands: >=1.5.5: all, >=1.5 all: except tune, <1.5: all except tune and create // rrdcached commands: >=1.5.5: all, >=1.5 all: except tune, <1.5: all except tune and create
if ($config['rrdcached'] && if ($config['rrdcached'] &&
(version_compare($config['rrdtool_version'], '1.5.5', '>=') || (version_compare($config['rrdtool_version'], '1.5.5', '>=') ||
@@ -179,6 +175,9 @@ function rrdtool($command, $filename, $options, $timeout = 0)
) { ) {
print $console_color->convert('[%rRRD Disabled%n]'); print $console_color->convert('[%rRRD Disabled%n]');
$output = array(null, null); $output = array(null, null);
} else if ($command == 'create' && file_exists($filename)){ // do not ovewrite files when creating
print $console_color->convert('[%yRRD file ' . $filename . ' already exist%n]');
$output = array(null, null);
} else { } else {
if ($timeout > 0 && stream_select($r = $rrd_pipes, $w = null, $x = null, 0)) { if ($timeout > 0 && stream_select($r = $rrd_pipes, $w = null, $x = null, 0)) {
// dump existing data // dump existing data