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

Quick and dirty fix for #4102

Browse Source 
Real fix is in #4104
This commit is contained in:
Tony Murray
2016-08-19 10:08:24 -05:00
parent 2c5cff480a
commit 7941768933
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/rrdtool.inc.php
View File

@ -153,7 +153,7 @@ function rrdtool($command, $filename, $options, $timeout = 0)
global $config, $debug, $vdebug, $rrd_pipes;
// do not ovewrite files when creating
if ($command == 'create') {
if ($command == 'create' && version_compare($config['rrdtool_version'], '1.4.3', '>=')) {
$options .= ' -O';
}
// rrdcached commands: >=1.5.5: all, >=1.5 all: except tune, <1.5: all except tune and create
@ -180,8 +180,8 @@ function rrdtool($command, $filename, $options, $timeout = 0)
) {
c_echo("[%rRRD Disabled%n]\n");
$output = array(null, null);
} elseif ($command == 'create' && version_compare($config['rrdtool_version'], '1.5', '<') && is_file($filename)) {
// do not overwrite RRD if it already exists and RRDTool ver. < 1.5
} elseif ($command == 'create' && version_compare($config['rrdtool_version'], '1.4.3', '<') && is_file($filename)) {
// do not overwrite RRD if it already exists and RRDTool ver. < 1.4.3
c_echo("RRD[%g$filename already exists%n]\n", $debug);
$output = array(null, null);
} else {