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

Reimplemented the main loop with the sighandler alarm inside in order to be able to control timeouts in the 'disk' graph. This should avoid a complete freeze if the network goes down when monitoring NFS filesystems. [#10]

This commit is contained in:
Jordi Sanfeliu 2013-06-07 08:59:57 +02:00
parent 7b9d0d7f0e
commit 72125804d0
1 changed files with 49 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
monitorix
View File

@ -45,7 +45,6 @@ $SIG{'STOP'} = 'INT_handler';
$SIG{'TERM'} = 'INT_handler';
$SIG{'CHLD'} = 'CHLD_handler';
$SIG{'HUP' } = 'HUP_handler';
$SIG{'ALRM'} = 'ALRM_handler';
use constant VERSION => "3.2.1";
use constant RELDATE => "03-Jun-2013";
@ -92,56 +91,6 @@ sub HUP_handler {
chown($uid, $gid, $config{httpd_builtin}->{log_file});
}
sub ALRM_handler {
my $myself = (caller(0))[3];
my ($sec, $min, $hour, $mday) = localtime(time);
# call all enabled graphs on every minute
if($sec == 0) {
foreach my $f (@{$config{func_update}}) {
my $update = $f . "_update";
my $d = $f;
logger("$myself: calling $update()") unless !$options{d};
undef($d) if(!grep {trim($_) eq $d} (@{$config{debug}}));
if(defined($options{d}) && $options{d} eq "all") {
$d = $f;
}
{
no strict "refs";
eval { &$update($f, \%config, $d); };
if($@) {
logger("$myself: $update(): $@");
}
}
}
if(lc($config{traffacct}->{enabled}) eq "y" && lc($config{traffacct}->{reports}->{enabled}) eq "y") {
my $d = "traffacct";
undef($d) if(!grep {trim($_) eq $d} (@{$config{debug}}));
# at 00:00h
if($min == 0 && $hour == 0) {
# collect traffic accounting every day
eval { traffacct::traffacct_getcounters(\%config, $d); };
if($@) {
logger("$myself: traffacct::traffacct_getcounters(): $@");
}
# send reports every first day of a month
if($mday == 1) {
eval { traffacct::traffacct_sendreports(\%config, $d); };
if($@) {
logger("$myself: traffacct::traffacct_sendreports(): $@");
}
}
}
}
}
alarm(1);
}
sub daemonize {
chdir("/") || die "Can't chdir to /: $!";
open(STDIN, "< /dev/null") || die "Can't read /dev/null: $!";
@ -519,7 +468,54 @@ if(lc($config{httpd_builtin}->{enabled} eq "y")) {
logger("Ok, done.") unless !$options{d};
alarm(1);
while(1) {
pause();
local $SIG{'ALRM'} = sub { alarm(1); };
alarm(1);
pause();
my ($sec, $min, $hour, $mday) = localtime(time);
# call to all enabled graphs on every minute
if($sec == 0) {
foreach my $f (@{$config{func_update}}) {
my $update = $f . "_update";
my $d = $f;
logger("Calling $update()") unless !$options{d};
undef($d) if(!grep {trim($_) eq $d} (@{$config{debug}}));
if(defined($options{d}) && $options{d} eq "all") {
$d = $f;
}
{
no strict "refs";
eval { &$update($f, \%config, $d); };
if($@) {
logger("$update(): $@");
}
}
}
if(lc($config{traffacct}->{enabled}) eq "y" && lc($config{traffacct}->{reports}->{enabled}) eq "y") {
my $d = "traffacct";
undef($d) if(!grep {trim($_) eq $d} (@{$config{debug}}));
# at 00:00h
if($min == 0 && $hour == 0) {
# collect traffic accounting every day
eval { traffacct::traffacct_getcounters(\%config, $d); };
if($@) {
logger("traffacct::traffacct_getcounters(): $@");
}
# send reports every first day of a month
if($mday == 1) {
eval { traffacct::traffacct_sendreports(\%config, $d); };
if($@) {
logger("traffacct::traffacct_sendreports(): $@");
}
}
}
}
}
}