From cfd44576ceb4524f948a500eeb543707f6c3e5ea Mon Sep 17 00:00:00 2001
From: Jordi Sanfeliu <jordi@fibranet.cat>
Date: Wed, 21 May 2014 15:32:07 +0200
Subject: [PATCH] added more verbosity during the startup

---
 Changes   | 3 ++-
 monitorix | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Changes b/Changes
index b15ffb5..ea8f4ee 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@
 ====================
 - Added a complete statistical Libvirt (libvirt) graph.
 - Added Upstart job. [#46]
+- Added more verbosity during the startup.
 - Fixed regexp that prevented collecting LOADPCT and ITEMP values in 'apcupsd'
   module.
 	(thanks to Patrick Fallberg, patrick AT fallberg.net)
@@ -11,7 +12,7 @@
   684. This happened if one of the filesystems defined is not a real mount
   point with an associated device name.
 	(thanks to Andreas Itzchak Rehberg, izzy AT qumran.org for pointing this out)
-- Fixed the values of the text table in the 'fs' graph.
+- Fixed the values in the text interface of the 'fs' graph.
 - Fixed init script to work with Chef properly. [#48]
 
 
diff --git a/monitorix b/monitorix
index b6c76cc..8c6df7c 100755
--- a/monitorix
+++ b/monitorix
@@ -417,6 +417,7 @@ $0 = sprintf("%s %s%s%s%s",
 
 daemonize() unless $options{n};
 logger("Starting Monitorix version " . VERSION . " (pid $$).");
+logger("Loaded main configuration file '$options{c}'.");
 
 # save the pidfile
 if($options{p}) {
@@ -452,7 +453,7 @@ if($config{include_dir} && opendir(DIR, $config{include_dir})) {
 	foreach my $c (sort @files) {
 		next unless -f $config{include_dir} . "/$c";
 		next unless $c =~ m/\.conf$/;
-		logger("Loading configuration file '$config{include_dir}/$c'.") unless !$options{d};
+		logger("Loading extra configuration file '$config{include_dir}/$c'.");
 		my $conf_inc = new Config::General(
 			-ConfigFile => $config{include_dir} . "/$c",
 		);
@@ -500,7 +501,7 @@ if(open(OUT, "> " . $config{base_dir} . "/cgi/monitorix.conf.path")) {
 
 flush_accounting_rules(\%config, $options{d});
 
-logger("Initializing graphs.") unless !$options{d};
+logger("Initializing graphs.");
 foreach (split(',', $config{graph_name} . ", traffacct")) {
 	my $g = trim($_);
 	my $e = "n";
@@ -538,7 +539,7 @@ if(!scalar($config{func_update})) {
 	exit(0);
 }
 
-logger("Generating the 'index.html' file.") unless !$options{d};
+logger("Generating the 'index.html' file.");
 create_index();
 
 if(lc($config{httpd_builtin}->{enabled} eq "y")) {