diff --git a/modoboa/extensions/postfix_autoreply/management/commands/autoreply.py b/modoboa/extensions/postfix_autoreply/management/commands/autoreply.py index 442bfc251..ae99e558c 100644 --- a/modoboa/extensions/postfix_autoreply/management/commands/autoreply.py +++ b/modoboa/extensions/postfix_autoreply/management/commands/autoreply.py @@ -14,7 +14,7 @@ from modoboa.extensions.postfix_autoreply.models import ARmessage, ARhistoric def send_autoreply(sender, mailbox, armessage): if armessage.untildate is not None \ - and armessage.untildate < datetime.datetime.now(): + and armessage.untildate < datetime.date.today(): armessage.enabled = False armessage.save() return diff --git a/modoboa/extensions/stats/management/commands/logparser.py b/modoboa/extensions/stats/management/commands/logparser.py index 7abb37af8..92045ec6a 100644 --- a/modoboa/extensions/stats/management/commands/logparser.py +++ b/modoboa/extensions/stats/management/commands/logparser.py @@ -30,6 +30,12 @@ from modoboa.admin.models import Domain from modoboa.extensions.stats import Stats import modoboa.extensions.stats.grapher as grapher +rrdstep = 60 +xpoints = 540 +points_per_sample = 3 +variables = ["sent", "recv", "bounced", "reject", "spam", "virus", + "size_sent", "size_recv"] + class LogParser(object): def __init__(self, options, workdir, year=None): self.logfile = options["logfile"]