mirrors
/
Monitorix
mirror of https://github.com/mikaku/Monitorix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added more verbosity during the startup

This commit is contained in:
Jordi Sanfeliu 2014-05-21 15:32:07 +02:00
parent ec45ee7746
commit cfd44576ce
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changes
View File

@ -2,6 +2,7 @@
==================== ====================
- Added a complete statistical Libvirt (libvirt) graph. - Added a complete statistical Libvirt (libvirt) graph.
- Added Upstart job. [#46] - Added Upstart job. [#46]
- Added more verbosity during the startup.
- Fixed regexp that prevented collecting LOADPCT and ITEMP values in 'apcupsd' - Fixed regexp that prevented collecting LOADPCT and ITEMP values in 'apcupsd'
module. module.
(thanks to Patrick Fallberg, patrick AT fallberg.net) (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 684. This happened if one of the filesystems defined is not a real mount
point with an associated device name. point with an associated device name.
(thanks to Andreas Itzchak Rehberg, izzy AT qumran.org for pointing this out) (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] - Fixed init script to work with Chef properly. [#48]

7
monitorix
View File

@ -417,6 +417,7 @@ $0 = sprintf("%s %s%s%s%s",
daemonize() unless $options{n}; daemonize() unless $options{n};
logger("Starting Monitorix version " . VERSION . " (pid $$)."); logger("Starting Monitorix version " . VERSION . " (pid $$).");
logger("Loaded main configuration file '$options{c}'.");
# save the pidfile # save the pidfile
if($options{p}) { if($options{p}) {
@ -452,7 +453,7 @@ if($config{include_dir} && opendir(DIR, $config{include_dir})) {
foreach my $c (sort @files) { foreach my $c (sort @files) {
next unless -f $config{include_dir} . "/$c"; next unless -f $config{include_dir} . "/$c";
next unless $c =~ m/\.conf$/; 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( my $conf_inc = new Config::General(
-ConfigFile => $config{include_dir} . "/$c", -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}); flush_accounting_rules(\%config, $options{d});
logger("Initializing graphs.") unless !$options{d}; logger("Initializing graphs.");
foreach (split(',', $config{graph_name} . ", traffacct")) { foreach (split(',', $config{graph_name} . ", traffacct")) {
my $g = trim($_); my $g = trim($_);
my $e = "n"; my $e = "n";
@ -538,7 +539,7 @@ if(!scalar($config{func_update})) {
exit(0); exit(0);
} }
logger("Generating the 'index.html' file.") unless !$options{d}; logger("Generating the 'index.html' file.");
create_index(); create_index();
if(lc($config{httpd_builtin}->{enabled} eq "y")) { if(lc($config{httpd_builtin}->{enabled} eq "y")) {