From ef96af3f3370aa0a76e40a2de4f630d5f1274ea6 Mon Sep 17 00:00:00 2001
From: Jordi Sanfeliu <jordi@fibranet.cat>
Date: Thu, 10 Jan 2013 15:47:46 +0100
Subject: [PATCH] last update for 3.0.0beta1

---
 lib/proc.pm    | 18 +++++++++---------
 monitorix.conf |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/proc.pm b/lib/proc.pm
index ae5d8b5..552bd81 100644
--- a/lib/proc.pm
+++ b/lib/proc.pm
@@ -182,15 +182,15 @@ sub proc_update {
 			@deltas = (
 
 				# $p[0] and $l[0] are the 'cpu' word
-				$p[1] - $l[1],	# user
-				$p[2] - $l[2],	# nice
-				$p[3] - $l[3],	# sys
-				$p[4] - $l[4],	# idle
-				$p[5] - $l[5],	# iow
-				$p[6] - $l[6],	# irq
-				$p[7] - $l[7],	# sirq
-				$p[8] - $l[8],	# steal
-				$p[9] - $l[9],	# guest
+				($p[1] || 0) - ($l[1] || 0),	# user
+				($p[2] || 0) - ($l[2] || 0),	# nice
+				($p[3] || 0) - ($l[3] || 0),	# sys
+				($p[4] || 0) - ($l[4] || 0),	# idle
+				($p[5] || 0) - ($l[5] || 0),	# iow
+				($p[6] || 0) - ($l[6] || 0),	# irq
+				($p[7] || 0) - ($l[7] || 0),	# sirq
+				($p[8] || 0) - ($l[8] || 0),	# steal
+				($p[9] || 0) - ($l[9] || 0),	# guest
 			);
 			$total = $deltas[0] + $deltas[1] + $deltas[2] + $deltas[3] + $deltas[4] + $deltas[5] + $deltas[6] + $deltas[7] + $deltas[8];
 
diff --git a/monitorix.conf b/monitorix.conf
index b0a76f9..3ce4936 100644
--- a/monitorix.conf
+++ b/monitorix.conf
@@ -20,7 +20,7 @@ base_cgi = /monitorix-cgi
 
 # Log files pathnames
 # -----------------------------------------------------------------------------
-log_file	= /var/log/monitorix3
+log_file	= /var/log/monitorix
 secure_log	= /var/log/secure
 mail_log	= /var/log/maillog
 milter_gl	= /var/milter-greylist/greylist.db