Merge branch 'patch-1' of github.com:skibbipl/Monitorix into skibbi-patch1

This commit is contained in:
Jordi Sanfeliu 2014-01-29 17:53:55 +01:00
commit d1a0ffe755
2 changed files with 5 additions and 2 deletions

View File

@ -561,11 +561,12 @@ while(1) {
# Email Reports
if(lc($config{emailreports}->{enabled}) eq "y") {
my $emailreports = $config{emailreports};
my $email_m = $emailreports->{minute};
my $email_h = $emailreports->{hour};
my $d = "emailreports";
undef($d) if(!grep {trim($_) eq $d} (@{$config{debug}}));
# at 00:00h
if($min == 0 && $hour == 0) {
if($min == $email_m && $hour == $email_h) {
eval "use emailreports qw(emailreports_send)";
if($@) {

View File

@ -543,6 +543,8 @@ secure_log_date_format = %b %e
url_prefix = http://localhost:8080
smtp_hostname = localhost
from_address = noreply@example.com
hour = 0
minute = 0
<daily>
enabled = n
graphs = system, fs