nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2041 from f0o/issue-2037

Browse Source 
Check rrdcached before creating rrds
This commit is contained in:
Neil Lathwood
2015-10-04 00:10:16 +01:00
parent 0f7d9c9f05 5fd1f59852
commit 42611a0f97
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/rrdtool.inc.php
+8 -1
View File
@@ -191,7 +191,7 @@ function rrdtool($command, $filename, $options) {
print $console_color->convert('RRD[%g'.$cmd.'%n] ');
}
else {
$tmp = stream_get_contents($rrd_pipes[1]).stream_get_contents($rrd_pipes[2]);
return array(stream_get_contents($rrd_pipes[1]),stream_get_contents($rrd_pipes[2]));
}
}
@@ -206,6 +206,13 @@ function rrdtool($command, $filename, $options) {
function rrdtool_create($filename, $options) {
global $config;
if( $config['rrdcached'] && $config['rrdtool_version'] >= 1.5 ) {
$chk = rrdtool('info', $filename, '');
if (!empty($chk[0])) {
return true;
}
}
return rrdtool('create', $filename, str_replace(array("\r", "\n"), '', $options));
}