From 69bea69bcdaf90a72c183b720656419ce5622fa4 Mon Sep 17 00:00:00 2001
From: Pim van den Berg
Date: Sun, 15 Jul 2012 11:46:50 +0200
Subject: type/GenericIO: only use raw totals when no scale is set

When scale is set, the total will be set twice (also in part below), which will
result in this error: "ERROR: Attempting to reuse 'tot_98574167'"

Bug introduced in commit:
v0.3-25-g19ed46a [type/GenericIO: add total calculations in IO graphs]
---
 type/GenericIO.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'type/GenericIO.class.php')

diff --git a/type/GenericIO.class.php b/type/GenericIO.class.php
index bc0fdef..3a56fb3 100644
--- a/type/GenericIO.class.php
+++ b/type/GenericIO.class.php
@@ -17,7 +17,8 @@ class Type_GenericIO extends Type_Default {
 				$rrdgraph[] = sprintf('DEF:min_%s%s="%s":%s:MIN', crc32hex($sources[$i]), $raw, $this->rrd_escape($this->files[$tinstance]), $ds);
 				$rrdgraph[] = sprintf('DEF:avg_%s%s="%s":%s:AVERAGE', crc32hex($sources[$i]), $raw, $this->rrd_escape($this->files[$tinstance]), $ds);
 				$rrdgraph[] = sprintf('DEF:max_%s%s="%s":%s:MAX', crc32hex($sources[$i]), $raw, $this->rrd_escape($this->files[$tinstance]), $ds);
-				$rrdgraph[] = sprintf('VDEF:tot_%1$s=avg_%1$s%2$s,TOTAL', crc32hex($sources[$i]), $raw);
+				if (!$raw)
+					$rrdgraph[] = sprintf('VDEF:tot_%s=avg_%1$s,TOTAL', crc32hex($sources[$i]));
 				$i++;
 			}
 		}
-- 
cgit v1.1